Merge remote-tracking branch 'upstream/master' into add-settitle-and-title-to-qwindow

SleepyTealCoder · SleepyTealCoder · commit 8a17316efe53 · 2025-02-08T12:15:43.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nodegui/nodegui",
-    "version": "0.70.0",
+    "version": "0.71.0",
     "description": "A cross-platform library to build native desktop apps.",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp
@@ -30,14 +30,18 @@ class DLL_EXPORT NMenu : public QMenu, public NodeWidget {
       Napi::Env env = this->emitOnNode.Env();
       Napi::HandleScope scope(env);
       auto instance = WrapperCache::instance.getWrapper(env, action);
-      this->emitOnNode.Call({Napi::String::New(env, "hovered"), instance});
+      if (instance != nullptr) {
+        this->emitOnNode.Call({Napi::String::New(env, "hovered"), instance});
+      }
     });
 
     QObject::connect(this, &QMenu::triggered, [=](QAction* action) {
       Napi::Env env = this->emitOnNode.Env();
       Napi::HandleScope scope(env);
       auto instance = WrapperCache::instance.getWrapper(env, action);
-      this->emitOnNode.Call({Napi::String::New(env, "triggered"), instance});
-    });
+      if (instance != nullptr) {
+        this->emitOnNode.Call({Napi::String::New(env, "triggered"), instance});
+      }
+    }); 
   }
 };
diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp
@@ -18,14 +18,21 @@ class DLL_EXPORT NMenuBar : public QMenuBar, public NodeWidget {
       Napi::Env env = this->emitOnNode.Env();
       Napi::HandleScope scope(env);
       auto instance = WrapperCache::instance.getWrapper(env, action);
-      this->emitOnNode.Call({Napi::String::New(env, "hovered"), instance});
-    });
+      // For some reason "instance" becomes a nullptr sometimes, 
+      // Passing in a nullptr CRASHES this
+      // since we don't know which item "hovered" we don't continue with the event.
+      if (instance != nullptr) {
+         this->emitOnNode.Call({Napi::String::New(env, "hovered"), instance});
+      }
+    }); 
 
     QObject::connect(this, &QMenuBar::triggered, [=](QAction* action) {
       Napi::Env env = this->emitOnNode.Env();
       Napi::HandleScope scope(env);
       auto instance = WrapperCache::instance.getWrapper(env, action);
-      this->emitOnNode.Call({Napi::String::New(env, "triggered"), instance});
-    });
+      if (instance != nullptr) {
+        this->emitOnNode.Call({Napi::String::New(env, "triggered"), instance});
+      }
+    }); 
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nodegui/nodegui",`
`3`		`- "version": "0.70.0",`
	`3`	`+ "version": "0.71.0",`
`4`	`4`	`"description": "A cross-platform library to build native desktop apps.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"typings": "dist/index.d.ts",`