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

* Last check in had an error when you tried to install ProcessController twice.

Browse Source 
* Had to change some names so that I didn't use the name tmp or temp :)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31566 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Fredrik Modeen
2009-07-14 18:43:22 +00:00
parent b7af6fd5a4
commit 05afd3332b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/processcontroller/PCWorld.cpp
+11 -9
View File
@@ -83,20 +83,21 @@ PCApplication::ReadyToRun()
BDeskbar deskbar; BDeskbar deskbar;
bool hasOne = deskbar.HasItem(kDeskbarItemName); bool hasOne = deskbar.HasItem(kDeskbarItemName);
BAlert* alert = NULL; BAlert* alertInstall = NULL;
if (!hasOne || (hasOne && version != kCurrentVersion)) { if (!hasOne || (hasOne && version != kCurrentVersion)) {
alert = new BAlert("", alertInstall = new BAlert("",
"Do you want ProcessController to live in the Deskbar?", "Don't", "Do you want ProcessController to live in the Deskbar?", "Don't",
"Install", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); "Install", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE); alertInstall->SetShortcut(0, B_ESCAPE);
} else { } else {
BAlert alertTemp("", BAlert* alert = new BAlert("",
"ProcessController are already installed in Deskbar.","Ok", NULL, "ProcessController are already installed in Deskbar.", "OK", NULL,
NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alertTemp.Go(); alert->SetShortcut(0, B_ESCAPE);
alert->Go();
} }
if (alert != NULL && alert->Go()) { if (alertInstall != NULL && alertInstall->Go()) {
// Restart deskbar to make sure the new version is picked up // Restart deskbar to make sure the new version is picked up
team_id deskbarTeam = be_roster->TeamFor(kDeskbarSig); team_id deskbarTeam = be_roster->TeamFor(kDeskbarSig);
if (deskbarTeam >= 0) { if (deskbarTeam >= 0) {
@@ -117,9 +118,10 @@ PCApplication::ReadyToRun()
move_to_deskbar(deskbar); move_to_deskbar(deskbar);
Quit(); Quit();
return; return;
} }
new PCWindow(); new PCWindow();
// quit other eventually running instances // quit other eventually running instances
BList list; BList list;
be_roster->GetAppList(kSignature, &list); be_roster->GetAppList(kSignature, &list);