Merge remote-tracking branch 'origin/candidate-9.8.x' into candidate-…

…9.10.x Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Jan 30, 2025 · f201ca1 · f201ca1
2 parents f7151c6 + 84d86b3
commit f201ca1
Show file tree

Hide file tree

Showing 5 changed files with 154 additions and 59 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -526,13 +526,11 @@ if(TOP_LEVEL_PROJECT)
                 !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"${CPACK_PACKAGE_VENDOR_WITHOUT_TRADEMARK}\\\\${version}\\\\${CPACK_NSIS_DISPLAY_NAME}\\\"
                 !define MUI_FINISHPAGE_NOAUTOCLOSE
             ")
-
-           list ( APPEND CPACK_NSIS_CREATE_ICONS_EXTRA "
+            set (CPACK_NSIS_CREATE_ICONS_EXTRA "
                 CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\ECL Command Prompt.lnk\\\" '%comspec%' '/k \\\"$INSTDIR\\\\ECLCmd.bat\\\"'
-           ")
-           list ( APPEND CPACK_NSIS_DELETE_ICONS_EXTRA "
-                Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\ECL CMD.lnk\\\"
-           ")
+            ")
+            set (CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\ECL Command Prompt.lnk'")
+
 
             set(CPACK_NSIS_MODIFY_PATH "ON")
 

diff --git a/dali/base/sysinfologger.cpp b/dali/base/sysinfologger.cpp
@@ -476,7 +476,7 @@ class CSysInfoLoggerMsgIterator : public CSimpleInterfaceOf<ISysInfoLoggerMsgIte
     }
     virtual bool next() override
     {
-        if (msgIter->next())
+        if (!msgIter->next())
             return false;
         return ensureMatch();
     }
@@ -612,7 +612,6 @@ unsigned deleteOlderThanLogSysInfoMsg(bool visibleOnly, bool hiddenOnly, unsigne
     // With visibleOnly/hiddenOnly option, use createSysInfoLoggerMsgFilter()
     if (visibleOnly || hiddenOnly || day)
     {
-        unsigned count = 0;
         Owned<ISysInfoLoggerMsgFilter> msgFilter = createSysInfoLoggerMsgFilter(source);
         if (hiddenOnly)
             msgFilter->setHiddenOnly();