Changeset 1823 for trunk

Timestamp:

04/22/12 09:06:47 (14 months ago)

Author:

philmoz

Message:

Fix for occasional crash when enabling edge overlay.
Menu module load & unload was happening in two different tasks which sometimes conflicted.

Location:

trunk/core

Files:

• gui.c (modified) (2 diffs)
• main.c (modified) (6 diffs)

trunk/core/gui.c

@@ -2086 +2086 @@
 
 //-------------------------------------------------------------------
+// Flag to tell SpyTask to unload GUI menu modules
+static int unload_gui_modules = 0;
+
+// Unload GUI menu modules in SpyTask
+void gui_kbd_unload_modules()
+{
+    if (unload_gui_modules)
+    {
+        // Unload all modules which are marked as safe to unload, or loaded for menus
+        gui_menu_unload_module_menus();
+        module_async_unload_allrunned(0);
+        unload_gui_modules = 0;
+    }
+}
+
 void gui_kbd_leave()
 {
@@ -2100 +2115 @@
     gui_set_mode(&defaultGuiHandler);
 
-        // Unload all modules which are marked as safe to unload, or loaded for menus
-    gui_menu_unload_module_menus();
-        module_async_unload_allrunned(0);
+    // This is called from the keyboard task
+    // Flag any modules loaded via menus or gui to be unloaded in SpyTask
+    // Unloading them here can lead to conflicts and crashes
+    unload_gui_modules = 1;
 
         conf_update_prevent_shutdown();

trunk/core/main.c

@@ -241 +241 @@
 
 #ifdef OPT_SCRIPTING
-    if (conf.script_startup==1) script_autostart();                             // remote autostart
+    if (conf.script_startup==1) script_autostart();             // remote autostart
     if (conf.script_startup==2) {
         conf.script_startup=0;
@@ -249 +249 @@
 #endif
 
-    while (1){
+    while (1)
+    {
 
 #ifdef  CAM_LOAD_CUSTOM_COLORS
@@ -255 +256 @@
 #endif
 
-        if (raw_data_available) {
+        if (raw_data_available)
+        {
             raw_need_postprocess = raw_savefile();
             hook_raw_save_complete();
@@ -271 +273 @@
         }
 
+        // Unload any GUI menu modules
+        extern void gui_kbd_unload_modules();
+        gui_kbd_unload_modules();
+
         if (state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)
         {
@@ -277 +283 @@
 
 #ifdef OPT_EDGEOVERLAY
-            if(((gui_get_mode()==GUI_MODE_NONE) || (gui_get_mode()==GUI_MODE_ALT)) && conf.edge_overlay_thresh && conf.edge_overlay_enable) {
-
-                                // We need to skip first tick because stability
-                                static int skip_counter=1;
-                                
-                                if (skip_counter>0) {
-                                        skip_counter--;
-                                }
-                                else if (module_edgeovr_load()) {
-                                        libedgeovr->edge_overlay();
-                                }
-                        }
+            if(((gui_get_mode()==GUI_MODE_NONE) || (gui_get_mode()==GUI_MODE_ALT)) && conf.edge_overlay_thresh && conf.edge_overlay_enable)
+            {
+                // We need to skip first tick because stability
+                static int skip_counter=1;
+
+                if (skip_counter>0)
+                {
+                    skip_counter--;
+                }
+                else if (module_edgeovr_load())
+                {
+                    libedgeovr->edge_overlay();
+                }
+            }
 #endif
         }
 
-        if ((state_shooting_progress == SHOOTING_PROGRESS_PROCESSING) && (!shooting_in_progress())) {
+        if ((state_shooting_progress == SHOOTING_PROGRESS_PROCESSING) && (!shooting_in_progress()))
+        {
             state_shooting_progress = SHOOTING_PROGRESS_DONE;
             if (raw_need_postprocess) raw_postprocess();
@@ -303 +312 @@
 #endif
 
-                // Process async module unload requests
-                module_tick_unloader();
+        // Process async module unload requests
+        module_tick_unloader();
 
         msleep(20);
-                chdk_started_flag=1;
+        chdk_started_flag=1;
     }
 }