Re:#9966 Fix Crash in MZFlickable

mozilla-mobile · Oct 24, 2024 · 485a2ad · 485a2ad
1 parent 2cb8754
commit 485a2ad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,7 +52,7 @@ nebula/nebula_autogen/
 nebula/libnebula.a
 src/mozillavpn_autogen/
 /build-*/
-/build/
+/build*/
 dummybuild
 
 # Node (for functional tests)

diff --git a/extension/socks5proxy/bin/CMakeLists.txt b/extension/socks5proxy/bin/CMakeLists.txt
@@ -18,6 +18,7 @@ if(WIN32)
     target_sources(socksproxy PRIVATE
         windowsbypass.cpp
         windowsbypass.h)
+    target_link_libraries(socksproxy PRIVATE Iphlpapi.lib)
 
     install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/socksproxy.exe

diff --git a/nebula/ui/components/MZFlickable.qml b/nebula/ui/components/MZFlickable.qml
@@ -22,15 +22,11 @@ Flickable {
     boundsBehavior: Flickable.StopAtBounds
     opacity: 0
 
-    onFlickContentHeightChanged: {
-        recalculateContentHeight()
-    }
-
-    onHeightChanged: {
-        recalculateContentHeight()
-    }
-
     Component.onCompleted: {
+        recalculateContentHeight()
+        this.onHeightChanged.connect(recalculateContentHeight)
+        this.onFlickContentHeightChanged.connect(recalculateContentHeight)
+
         opacity = 1;
         if (Qt.platform.os === "windows") {
             maximumFlickVelocity = 700;

diff --git a/src/commands/commandui.cpp b/src/commands/commandui.cpp
@@ -207,7 +207,7 @@ int CommandUI::run(QStringList& tokens) {
     EventListener eventListener;
 #endif
 
-#ifdef MZ_DEBUG
+#ifdef false
     // This enables the qt-creator qml debugger on debug builds.:
     // Go to QtCreator: Debug->Start Debugging-> Attach to QML port
     // Port is 1234.

diff --git a/src/platforms/windows/daemon/windowsfirewall.cpp b/src/platforms/windows/daemon/windowsfirewall.cpp
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QScopeGuard>
 #include <QtEndian>
+#include <utility>
 
 #include "ipaddress.h"
 #include "leakdetector.h"
@@ -320,7 +321,7 @@ bool WindowsFirewall::disableKillSwitch() {
     FwpmFilterDeleteById0(m_sessionHandle, filterID);
   }
 
-  for (const auto& filterID : qAsConst(m_activeRules)) {
+  for (const auto& filterID : std::as_const(m_activeRules)) {
     FwpmFilterDeleteById0(m_sessionHandle, filterID);
   }