From b06e48bb2b13b4d9e34da29b5e5f20e70a510b93 Mon Sep 17 00:00:00 2001
From: Janus <janus2@ymail.com>
Date: Tue, 21 Nov 2017 14:25:00 +0100
Subject: [PATCH] [PowerStatus] Avoid crashes on exit when Info window is
 opened

* Fixes #10885
---
 src/apps/powerstatus/PowerStatusView.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp
index f7374482d1..c9bfbc08b2 100644
--- a/src/apps/powerstatus/PowerStatusView.cpp
+++ b/src/apps/powerstatus/PowerStatusView.cpp
@@ -612,6 +612,11 @@ PowerStatusReplicant::~PowerStatusReplicant()
 	if (fMessengerExist)
 		delete fExtWindowMessenger;
 
+	if (fExtendedWindow && fExtendedWindow->Lock()) {
+			fExtendedWindow->Quit();
+			fExtendedWindow = NULL;
+	}
+
 	fDriverInterface->StopWatching(this);
 	fDriverInterface->Disconnect();
 	fDriverInterface->ReleaseReference();