diff options
author | Gerald Combs <gerald@wireshark.org> | 2024-01-04 14:12:37 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2024-01-04 14:14:15 -0800 |
commit | e68771714aa72f1217d225821121a09ab2cf6fd0 (patch) | |
tree | 0dd814df47ab13e512fc8fa9c3ce458d30fe7079 /ui | |
parent | 96b0a674c71761f2c0d30d046e9f118caeefeb56 (diff) |
Qt: Update some comments related to WinSparkle
[skip ci]
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/main_application.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ui/qt/main_application.cpp b/ui/qt/main_application.cpp index c8fa4b5ff0..4cde0a8cc1 100644 --- a/ui/qt/main_application.cpp +++ b/ui/qt/main_application.cpp @@ -1260,8 +1260,11 @@ bool MainApplication::softwareUpdateCanShutdown() { software_update_ok_ = true; // At this point the update is ready to install, but WinSparkle has // not yet run the installer. We need to close our "Wireshark is - // running" mutexes along with those of our child processes, e.g. - // dumpcap. + // running" mutexes since the IsWiresharkRunning NSIS macro checks + // for them. + // + // We must not exit the Qt main event loop here, which means we must + // not close the main window. // Step 1: See if we have any open files. emit softwareUpdateRequested(); @@ -1276,7 +1279,9 @@ bool MainApplication::softwareUpdateCanShutdown() { void MainApplication::softwareUpdateShutdownRequest() { // At this point the installer has been launched. Neither Wireshark nor // its children should have any "Wireshark is running" mutexes open. - // The main window should be closed. + // The main window should still be open as noted above in + // softwareUpdateCanShutdown and it's safe to exit the Qt main + // event loop. // Step 3: Quit. emit softwareUpdateQuit(); |