Revert "#439 rearranged order in choiceRestoration to ensure _current…

…Entry is set before clone, and thus the resulting updateGUI"

This reverts commit 2cabb20.

Engine/KnobTypes.cpp

@@ -1140,7 +1140,16 @@ KnobChoice::choiceRestoration(KnobChoice* knob,
 {
     assert(knob);
 
-    // ensure _currentEntry is set before eventually triggering GUI update
+    ///Clone first and then handle restoration of the static value
+    clone(knob);
+    setSecret( knob->getIsSecret() );
+    if ( getDimension() == knob->getDimension() ) {
+        for (int i = 0; i < knob->getDimension(); ++i) {
+            setEnabled( i, knob->isEnabled(i) );
+        }
+    }
+
+
     {
         QMutexLocker k(&_entriesMutex);
         if (id >= 0) {
@@ -1151,15 +1160,6 @@ KnobChoice::choiceRestoration(KnobChoice* knob,
         }
     }
 
-    ///Clone first and then handle restoration of the static value
-    clone(knob);
-    setSecret( knob->getIsSecret() );
-    if ( getDimension() == knob->getDimension() ) {
-        for (int i = 0; i < knob->getDimension(); ++i) {
-            setEnabled( i, knob->isEnabled(i) );
-        }
-    }
-
     if (id >= 0) {
         setValue(id);
     }