Fix crash in release

mhtvsSFrpHdE · Sep 11, 2022 · 44cc23c · 44cc23c
1 parent 25ede4e
commit 44cc23c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/qpp/prefetch/Source/Interface/TrayIcon/Action/custom_action.h b/qpp/prefetch/Source/Interface/TrayIcon/Action/custom_action.h
@@ -1,6 +1,10 @@
 #include <QAction>
 #include <QString>
 
+// Pointer to function does not support point to member function
+// Only pass static function pointer here
+// GCC may allow the code to compile, but Qt doesn't support:
+//     Code will crash in internal Qt, even after parameter function is returned successfully.
 typedef void (*ParameterSlot)(void *);
 
 // QAction, connect void signal to parameter slot

diff --git a/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.cpp b/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.cpp
@@ -93,7 +93,7 @@ void TrayIcon::init()
 
         // Create action
         auto customMenu = new CustomAction(menuName, qMenu);
-        customMenu->init(new QString(menuCommand), ParameterSlot(&TrayIcon::action_custom));
+        customMenu->init(new QString(menuCommand), &action_custom);
         connect(customMenu, SIGNAL(triggered()), customMenu, SLOT(triggered_slot()));
         qMenu->addAction(customMenu);
 

diff --git a/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.h b/qpp/prefetch/Source/Interface/TrayIcon/tray_icon.h
@@ -26,7 +26,7 @@ public slots:
     void action_traydc_void();
     void action_test();
     void action_updateMenu(QSystemTrayIcon::ActivationReason activationReason);
-    void action_custom(void *command);
+    static void action_custom(void *command);
 
 private:
     static QSystemTrayIcon *systemTrayIcon;