From cd962396af5c12ce6cce1e97ea96f780112cd01d Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 26 Dec 2015 10:26:42 -0800
Subject: [PATCH] Cache initialization state on language change

User prompts -> restore after finish

Moved mouseslot right-click abort logic earlier.
---
 PKX/f1-Main.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index 59458a0a4..f70399620 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -723,14 +723,16 @@ private void openSave(bool oras)
         // Language Translation
         private void changeMainLanguage(object sender, EventArgs e)
         {
-            byte[] data = pk6.Data;
-            if (fieldsInitialized) data = preparepkx(); // get data currently in form
+            byte[] data = fieldsInitialized ? preparepkx() : pk6.Data;
+            bool alreadyInit = fieldsInitialized;
             fieldsInitialized = false;
             Menu_Options.DropDown.Close();
             InitializeStrings();
             InitializeLanguage();
             Util.TranslateInterface(this, lang_val[CB_MainLanguage.SelectedIndex], menuStrip1); // Translate the UI to language.
             populateFields(data); // put data back in form
+            if (alreadyInit)
+                fieldsInitialized = true;
         }
         private void InitializeStrings()
         {
@@ -3281,6 +3283,7 @@ private void clickOpenTempFolder(object sender, EventArgs e)
         // Drag & Drop within Box
         private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e)
         {
+            if (e.Button != MouseButtons.Left || e.Clicks != 1) return;
             if (ModifierKeys == Keys.Control || ModifierKeys == Keys.Alt || ModifierKeys == Keys.Shift || ModifierKeys == (Keys.Control | Keys.Alt))
             { clickSlot(sender, e); return; }
             PictureBox pb = (PictureBox)(sender);
@@ -3289,7 +3292,6 @@ private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e)
 
             pkm_from_slot = getSlot(sender);
             int offset = getPKXOffset(pkm_from_slot);
-            if (e.Button != MouseButtons.Left || e.Clicks != 1) return;
             // Create Temp File to Drag
             Cursor.Current = Cursors.Hand;