From 93b54d007f30212033980d92e03a68884c87a465 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sun, 28 Apr 2019 13:18:12 +0200
Subject: [PATCH] [POWERCFG] Fix minor power scheme issues

- Really fix the exception that occurs on closing the property sheet.
- Use the correct scheme ID when the current power scheme is set.
---
 dll/cpl/powercfg/powershemes.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dll/cpl/powercfg/powershemes.c b/dll/cpl/powercfg/powershemes.c
index 7d1441a0430..7654f1758cb 100644
--- a/dll/cpl/powercfg/powershemes.c
+++ b/dll/cpl/powercfg/powershemes.c
@@ -162,9 +162,12 @@ DestroySchemesList(
     PLIST_ENTRY ListEntry;
     PPOWER_SCHEME pScheme;
 
-    while (!IsListEmpty(&pPageData->PowerSchemesList))
+    for (;;)
     {
         ListEntry = pPageData->PowerSchemesList.Flink;
+        if (ListEntry == &pPageData->PowerSchemesList)
+            break;
+
         pScheme = CONTAINING_RECORD(ListEntry, POWER_SCHEME, ListEntry);
         DeletePowerScheme(pScheme);
     }
@@ -560,7 +563,7 @@ Pos_SaveData(HWND hwndDlg)
         pScheme->PowerPolicy.mach.DozeS4TimeoutDc = Sec[tmp];
     }
 
-    SetActivePwrScheme(iCurSel, NULL, &pScheme->PowerPolicy);
+    SetActivePwrScheme(pScheme->uId, NULL, &pScheme->PowerPolicy);
     LoadConfig(hwndDlg);
 }
 
-- 
2.17.1