From 05afd3332b9e240a0c721de45d4807bff9dda094 Mon Sep 17 00:00:00 2001 From: Fredrik Modeen Date: Tue, 14 Jul 2009 18:43:22 +0000 Subject: [PATCH] * Last check in had an error when you tried to install ProcessController twice. * 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 --- src/apps/processcontroller/PCWorld.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/apps/processcontroller/PCWorld.cpp b/src/apps/processcontroller/PCWorld.cpp index 5fc17e9806..ef2b326c01 100644 --- a/src/apps/processcontroller/PCWorld.cpp +++ b/src/apps/processcontroller/PCWorld.cpp @@ -83,20 +83,21 @@ PCApplication::ReadyToRun() BDeskbar deskbar; bool hasOne = deskbar.HasItem(kDeskbarItemName); - BAlert* alert = NULL; + BAlert* alertInstall = NULL; if (!hasOne || (hasOne && version != kCurrentVersion)) { - alert = new BAlert("", + alertInstall = new BAlert("", "Do you want ProcessController to live in the Deskbar?", "Don't", "Install", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); - alert->SetShortcut(0, B_ESCAPE); + alertInstall->SetShortcut(0, B_ESCAPE); } else { - BAlert alertTemp("", - "ProcessController are already installed in Deskbar.","Ok", NULL, + BAlert* alert = new BAlert("", + "ProcessController are already installed in Deskbar.", "OK", NULL, 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 team_id deskbarTeam = be_roster->TeamFor(kDeskbarSig); if (deskbarTeam >= 0) { @@ -117,9 +118,10 @@ PCApplication::ReadyToRun() move_to_deskbar(deskbar); Quit(); return; - } + } + new PCWindow(); - + // quit other eventually running instances BList list; be_roster->GetAppList(kSignature, &list);