[haiku-commits] haiku: hrev44479 - in src/apps: resedit installer

  • From: humdingerb@xxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 6 Aug 2012 18:23:49 +0200 (CEST)

hrev44479 adds 2 changesets to branch 'master'
old head: adfe152ee269d1d6153827ca38a174f217d2634d
new head: 4d99b24ded47a36bf813a71d1d658949daef4438

----------------------------------------------------------------------------

34e3453: Added accidentally removed "!=0" back...

4d99b24: Removed Mr.Peeps from a ResEdit alert. Thanks Eagleeye Ryan!

                                        [ Humdinger <humdingerb@xxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 2 insertions(+), 2 deletions(-)
src/apps/installer/InstallerWindow.cpp |    2 +-
src/apps/resedit/BitmapView.cpp        |    2 +-

############################################################################

Commit:      34e3453f24f8b17ed70eb4574330e3e70bcd1daf
URL:         http://cgit.haiku-os.org/haiku/commit/?id=34e3453
Author:      Humdinger <humdingerb@xxxxxxxxx>
Date:        Mon Aug  6 16:17:56 2012 UTC

Added accidentally removed "!=0" back...

----------------------------------------------------------------------------

diff --git a/src/apps/installer/InstallerWindow.cpp 
b/src/apps/installer/InstallerWindow.cpp
index cc639ea..4dd4899 100644
--- a/src/apps/installer/InstallerWindow.cpp
+++ b/src/apps/installer/InstallerWindow.cpp
@@ -897,7 +897,7 @@ InstallerWindow::_QuitCopyEngine(bool askUser)
                        B_TRANSLATE_COMMENT("Stop", "In alert after pressing 
Stop"), 0,
                        B_WIDTH_AS_USUAL, B_STOP_ALERT);
                alert->SetShortcut(1, B_ESCAPE);
-               quit = alert->Go();
+               quit = alert->Go() != 0;
        }
 
        if (quit) {

############################################################################

Revision:    hrev44479
Commit:      4d99b24ded47a36bf813a71d1d658949daef4438
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4d99b24
Author:      Humdinger <humdingerb@xxxxxxxxx>
Date:        Mon Aug  6 16:21:14 2012 UTC

Removed Mr.Peeps from a ResEdit alert. Thanks Eagleeye Ryan!

----------------------------------------------------------------------------

diff --git a/src/apps/resedit/BitmapView.cpp b/src/apps/resedit/BitmapView.cpp
index 007fc60..4002b60 100644
--- a/src/apps/resedit/BitmapView.cpp
+++ b/src/apps/resedit/BitmapView.cpp
@@ -250,7 +250,7 @@ BitmapView::MessageReceived(BMessage *msg)
        switch (msg->what)
        {
                case M_REMOVE_IMAGE: {
-                       BAlert *alert = new BAlert("Mr. Peeps!", "This cannot 
be undone. "
+                       BAlert *alert = new BAlert("ResEdit", "This cannot be 
undone. "
                                "Remove the image?", "Remove", "Cancel");
                        alert->SetShortcut(1, B_ESCAPE);
                        int32 value = alert->Go();


Other related posts:

  • » [haiku-commits] haiku: hrev44479 - in src/apps: resedit installer - humdingerb