i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PowerStatus: exit early if no battery is detected.

Browse Source 
Fixes #7472
This commit is contained in:
Adrien Destugues
2020-08-05 19:47:38 +02:00
parent ca6302dded
commit 4fb9b30056
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/powerstatus/PowerStatus.cpp
+20 -1
View File
@@ -8,7 +8,6 @@
#include "PowerStatus.h" #include "PowerStatus.h"
#include "PowerStatusWindow.h"
#include <Alert.h> #include <Alert.h>
#include <Application.h> #include <Application.h>
@@ -20,6 +19,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "ACPIDriverInterface.h"
#include "APMDriverInterface.h"
#include "PowerStatusWindow.h"
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "PowerStatus" #define B_TRANSLATION_CONTEXT "PowerStatus"
@@ -74,6 +77,22 @@ PowerStatus::ReadyToRun()
bool isInstalled = false; bool isInstalled = false;
bool isDeskbarRunning = true; bool isDeskbarRunning = true;
PowerStatusDriverInterface* interface;
interface = new ACPIDriverInterface;
if (interface->Connect() != B_OK) {
delete interface;
interface = new APMDriverInterface;
if (interface->Connect() != B_OK) {
BAlert* alert = new BAlert("",
B_TRANSLATE("No supported battery detected. PowerStatus "
"cannot be used on your system."), B_TRANSLATE("Too bad!"),
NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->Go();
Quit();
}
}
delete interface;
{ {
// if the Deskbar is not alive at this point, it might be after having // if the Deskbar is not alive at this point, it might be after having
// acknowledged the requester below // acknowledged the requester below