From e2c343a22a731d4ec7f6ede64adb36dbf275021e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Mod=C3=A9en?= <fredrik@modeen.se>
Date: Wed, 25 Jul 2012 00:48:24 +0000
Subject: [PATCH] Fixing #6913. * Checking and setting a default value if both
 icon and text are false.

---
 src/apps/powerstatus/PowerStatusView.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp
index f0362e8b3b..647dae5399 100644
--- a/src/apps/powerstatus/PowerStatusView.cpp
+++ b/src/apps/powerstatus/PowerStatusView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2012, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -419,6 +419,10 @@ PowerStatusView::FromMessage(const BMessage* archive)
 		fShowStatusIcon = value;
 	if (archive->FindBool("show time", &value) == B_OK)
 		fShowTime = value;
+	
+	//Incase we have a bad saving and none are showed..
+	if (!fShowLabel && !fShowStatusIcon)
+		fShowLabel = true;
 
 	int32 intValue;
 	if (archive->FindInt32("battery id", &intValue) == B_OK)
@@ -539,7 +543,11 @@ PowerStatusReplicant::MessageReceived(BMessage *message)
 {
 	switch (message->what) {
 		case kMsgToggleLabel:
-			fShowLabel = !fShowLabel;
+			if (fShowStatusIcon)
+				fShowLabel = !fShowLabel;
+			else
+				fShowLabel = true;
+				
 			Update(true);
 			break;
 
@@ -549,7 +557,11 @@ PowerStatusReplicant::MessageReceived(BMessage *message)
 			break;
 
 		case kMsgToggleStatusIcon:
-			fShowStatusIcon = !fShowStatusIcon;
+			if (fShowLabel)
+				fShowStatusIcon = !fShowStatusIcon;
+			else
+				fShowStatusIcon = true;
+
 			Update(true);
 			break;