Merge develop changes prior to upcoming WDK release (May 2024)

1 files changed, 6 insertions, 1 deletions

diff --git a/setup/devcon/devcon.cpp b/setup/devcon/devcon.cpp
index b1bdbf2a..7e7e88a7 100644
--- a/setup/devcon/devcon.cpp
+++ b/setup/devcon/devcon.cpp
@@ -1149,7 +1149,12 @@ Return Value:
     for(dispIndex = 0;DispatchTable[dispIndex].cmd;dispIndex++) {
         if ((_tcsicmp(cmd,DispatchTable[dispIndex].cmd) == 0) &&
             (argc >= firstArg)) {
-            retval = DispatchTable[dispIndex].func(baseName,machine,flags,argc-firstArg,argv+firstArg);
+            if (argc == firstArg) {
+                retval = DispatchTable[dispIndex].func(baseName,machine,flags,0,NULL);
+            } else {
+                retval = DispatchTable[dispIndex].func(baseName,machine,flags,argc-firstArg,argv+firstArg);
+            }            
+            
             switch(retval) {
                 case EXIT_USAGE:
                     CommandUsage(baseName,DispatchTable[dispIndex].cmd);