Minor fixes.

dchapyshev · dchapyshev · commit c75a34181368 · 2025-04-23T01:36:32.000+02:00
diff --git a/source/base/threading/asio_event_dispatcher.cc b/source/base/threading/asio_event_dispatcher.cc
@@ -165,9 +165,10 @@ bool AsioEventDispatcher::unregisterTimers(QObject* object)
         }
     }
 
-    if (removed)
-        asyncWaitForNextTimer();
+    if (!removed)
+        return false;
 
+    asyncWaitForNextTimer();
     return true;
 }
 
@@ -283,7 +284,7 @@ asio::io_context& AsioEventDispatcher::ioContext()
 
 //--------------------------------------------------------------------------------------------------
 // static
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WINDOWS)
 void AsioEventDispatcher::eventCallback(PVOID parameter, BOOLEAN /* timer_or_wait_fired */)
 {
     QWinEventNotifier* notifier = reinterpret_cast<QWinEventNotifier*>(parameter);
@@ -295,7 +296,7 @@ void AsioEventDispatcher::eventCallback(PVOID parameter, BOOLEAN /* timer_or_wai
 
     emit notifier->activated(notifier->handle(), {});
 }
-#endif // defined(Q_OS_WIN)
+#endif // defined(Q_OS_WINDOWS)
 
 //--------------------------------------------------------------------------------------------------
 void AsioEventDispatcher::asyncWaitForNextTimer()

Original file line number	Diff line number	Diff line change
`@@ -165,9 +165,10 @@ bool AsioEventDispatcher::unregisterTimers(QObject* object)`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`- if (removed)`
`169`		`- asyncWaitForNextTimer();`
	`168`	`+ if (!removed)`
	`169`	`+ return false;`
`170`	`170`
	`171`	`+ asyncWaitForNextTimer();`
`171`	`172`	`return true;`
`172`	`173`	`}`
`173`	`174`
`@@ -283,7 +284,7 @@ asio::io_context& AsioEventDispatcher::ioContext()`
`283`	`284`
`284`	`285`	`//--------------------------------------------------------------------------------------------------`
`285`	`286`	`// static`
`286`		`-#if defined(Q_OS_WIN)`
	`287`	`+#if defined(Q_OS_WINDOWS)`
`287`	`288`	`void AsioEventDispatcher::eventCallback(PVOID parameter, BOOLEAN /* timer_or_wait_fired */)`
`288`	`289`	`{`
`289`	`290`	`QWinEventNotifier* notifier = reinterpret_cast<QWinEventNotifier*>(parameter);`
`@@ -295,7 +296,7 @@ void AsioEventDispatcher::eventCallback(PVOID parameter, BOOLEAN /* timer_or_wai`
`295`	`296`
`296`	`297`	`emit notifier->activated(notifier->handle(), {});`
`297`	`298`	`}`
`298`		`-#endif // defined(Q_OS_WIN)`
	`299`	`+#endif // defined(Q_OS_WINDOWS)`
`299`	`300`
`300`	`301`	`//--------------------------------------------------------------------------------------------------`
`301`	`302`	`void AsioEventDispatcher::asyncWaitForNextTimer()`