X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=reactos%2Flib%2Fdevmgr%2Fadvprop.c;h=8a0aae07d98e09c26ed09609dec34394f3937863;hp=43b52127881a67f4bc7f9c5a4672cc55af6c6144;hb=8fed897da5642d65b82eb04d6b53b472f87bef32;hpb=7cc50f245acd3643dbe77884f006ae0c942abdff

diff --git a/reactos/lib/devmgr/advprop.c b/reactos/lib/devmgr/advprop.c
index 43b52127881..8a0aae07d98 100644
--- a/reactos/lib/devmgr/advprop.c
+++ b/reactos/lib/devmgr/advprop.c
@@ -808,17 +808,13 @@ GetParentNode:
                 else
                 {
                     /* cleanup, we were unable to get the device property sheets */
+                    iPage = nDriverPages;
                     dap->nDevPropSheets -= nDriverPages;
                     nDriverPages = 0;
-                    if (dap->nDevPropSheets == 0)
-                    {
-                        HeapFree(GetProcessHeap(),
-                                 0,
-                                 dap->DevPropSheets);
-                        dap->DevPropSheets = NULL;
-                    }
                 }
             }
+            else
+                iPage = 0;
 
             /* add the driver page if necessary */
             if (dap->HasDriverPage)
@@ -841,6 +837,7 @@ GetParentNode:
                     else
                     {
                         dap->pDestroyPropertySheetPage(dap->DevPropSheets[iPage]);
+                        dap->DevPropSheets[iPage] = NULL;
                     }
                 }
             }
@@ -1105,7 +1102,7 @@ DisplayDeviceAdvancedProperties(IN HWND hWndParent,
         DevIdSize = (DWORD)wcslen(lpDeviceID) + 1;
     }
 
-    if (lpMachineName != NULL)
+    if (lpMachineName != NULL && lpMachineName[0] != L'\0')
     {
         CONFIGRET cr = CM_Connect_Machine(lpMachineName,
                                           &hMachine);