Changeset 616

Timestamp:

Jan 15, 2013, 1:57:48 AM (12 years ago)

Author:

alloc

Message:

AEI2:

• Fixed bug on MacOS X making a dialog not accessible

Location:

AE/installer2

Files:

• setup_win/AEInstaller-v0.77-Setup.exe (deleted)
• src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.yml (modified) (1 diff)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.77
+appversion=0.78
 
 invalidPath.title=Wrong directory

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -488 +488 @@
         }
 
-        @DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
-        private void initialize(final BackgroundEvent evt) {
+        @SuppressWarnings("unused")
+        private void checkInitialize() {
                 if (!Installer.isEditionInitialized()) {
                         int res = JOptionPane.showConfirmDialog(this,
@@ -498 +498 @@
                                 saveLocalData();
                                 exit();
-                        } else {
-                                Installer.initializeEdition(new InstallProgressListener() {
-                                        @Override
-                                        public void installProgressUpdate(int done, int total,
-                                                        String step) {
-                                                evt.setProgressEnd(total);
-                                                evt.setProgressValue(done);
-                                                evt.setProgressMessage(step);
-                                        }
-                                });
-                        }
+                        }
+                }
+        }
+
+        @DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
+        private void initialize(final BackgroundEvent evt) {
+                if (!Installer.isEditionInitialized()) {
+                        Installer.initializeEdition(new InstallProgressListener() {
+                                @Override
+                                public void installProgressUpdate(int done, int total,
+                                                String step) {
+                                        evt.setProgressEnd(total);
+                                        evt.setProgressValue(done);
+                                        evt.setProgressMessage(step);
+                                }
+                        });
                 }
         }

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus]
+  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,checkInitialize,initialize,checkUpdates,focus]
   onWindowClosing: [saveLocalData,exit]
   iconImage: img.ae