Changeset 279:623ab1e3c18d

Timestamp:

Aug 15, 2011, 5:44:36 PM (13 years ago)

Author:

Evgeny Stambulchik <Evgeny.Stambulchik@…>

Branch:

default

Phase:

public

Message:

Make sure GUI does not remain locked forever.

File:

• source/class/pf/Application.js (modified) (1 diff)

source/class/pf/Application.js

@@ -438 +438 @@
             this.gui_locked = true;
             
-            if (this.prefs.currentConfigName) {
-                this.gui_configName.setLabel(this.prefs.currentConfigName);
-            }
-            
-            this.gui_N_e.setNumValue(this.plasma.e.getN());
-            this.gui_T_e.setNumValue(this.plasma.e.getT());
-            
-            this.gui_N_i.setNumValue(this.plasma.i.getN());
-            this.gui_T_i.setNumValue(this.plasma.i.getT());
-            this.gui_Z_i.setValue(this.plasma.i.getQ());
-            this.gui_M_i.setNumValue(this.plasma.i.getM());
-
-            this.gui_P_r.setValue(100*this.plasma.P_r);
-            
-            this.gui_N_r.setNumValue(this.plasma.r.getN());
-            this.gui_T_r.setNumValue(this.plasma.r.getT());
-            this.gui_Z_r.setValue(this.plasma.r.getQ());
-            this.gui_Zcore.setValue((this.plasma.r.getQ() + 1) + '');
-            this.gui_M_r.setNumValue(this.plasma.r.getM());
-            
-            this.gui_B.setNumValue(this.plasma.B);
-            
-            this.gui_n_u.setValue(this.plasma.n_u);
-            this.gui_n_l.setValue(this.plasma.n_l);
-            
-            // Update the currently selected entity
-            this.updateEntityValue();
-            
-            // Update the list of favorites
-            this.updateFavoritesListView();
-            this.updateLegendListView();
+            // make sure GUI does not remain locked forever...
+            try {
+                if (this.prefs.currentConfigName) {
+                    this.gui_configName.setLabel(this.prefs.currentConfigName);
+                }
+
+                this.gui_N_e.setNumValue(this.plasma.e.getN());
+                this.gui_T_e.setNumValue(this.plasma.e.getT());
+
+                this.gui_N_i.setNumValue(this.plasma.i.getN());
+                this.gui_T_i.setNumValue(this.plasma.i.getT());
+                this.gui_Z_i.setValue(this.plasma.i.getQ());
+                this.gui_M_i.setNumValue(this.plasma.i.getM());
+
+                this.gui_P_r.setValue(100*this.plasma.P_r);
+
+                this.gui_N_r.setNumValue(this.plasma.r.getN());
+                this.gui_T_r.setNumValue(this.plasma.r.getT());
+                this.gui_Z_r.setValue(this.plasma.r.getQ());
+                this.gui_Zcore.setValue((this.plasma.r.getQ() + 1) + '');
+                this.gui_M_r.setNumValue(this.plasma.r.getM());
+
+                this.gui_B.setNumValue(this.plasma.B);
+
+                this.gui_n_u.setValue(this.plasma.n_u);
+                this.gui_n_l.setValue(this.plasma.n_l);
+
+                // Update the currently selected entity
+                this.updateEntityValue();
+
+                // Update the list of favorites
+                this.updateFavoritesListView();
+                this.updateLegendListView();
+            } catch (err) {
+                this.error(err);
+            }
             
             this.gui_locked = false;