[haiku-commits] haiku: hrev47613 - src/kits/tracker

  • From: stpere@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 2 Aug 2014 00:19:27 +0200 (CEST)

hrev47613 adds 1 changeset to branch 'master'
old head: 1336892c8be5952064b84eb32d4aa0fa3943a8b8
new head: 478d9536a6ca04a8d5bb98532eb22bcc11bd48e1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=478d953+%5E1336892

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

478d953: Icon outline setting was ignored if no background image found
  
  Might have been the cause behind #10019.

                                [ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]

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

Revision:    hrev47613
Commit:      478d9536a6ca04a8d5bb98532eb22bcc11bd48e1
URL:         http://cgit.haiku-os.org/haiku/commit/?id=478d953
Author:      Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date:        Fri Aug  1 22:07:25 2014 UTC

Ticket:      https://dev.haiku-os.org/ticket/10019

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

1 file changed, 2 insertions(+), 5 deletions(-)
src/kits/tracker/BackgroundImage.cpp | 7 ++-----

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

diff --git a/src/kits/tracker/BackgroundImage.cpp 
b/src/kits/tracker/BackgroundImage.cpp
index fb96183..f981da3 100644
--- a/src/kits/tracker/BackgroundImage.cpp
+++ b/src/kits/tracker/BackgroundImage.cpp
@@ -98,16 +98,13 @@ BackgroundImage::GetBackgroundImage(const BNode* node, bool 
isDesktop)
                if (container.FindString(kBackgroundImageInfoPath, index, &path)
                                == B_OK) {
                        bitmap = BTranslationUtils::GetBitmap(path);
-                       if (!bitmap) {
+                       if (!bitmap)
                                PRINT(("failed to load background bitmap from 
path\n"));
-                               continue;
-                       }
                } else
                        break;
 
-               if (be_control_look != NULL && isDesktop) {
+               if (be_control_look != NULL && isDesktop)
                        be_control_look->SetBackgroundInfo(container);
-               }
 
                container.FindInt32(kBackgroundImageInfoWorkspaces, index,
                        (int32*)&workspaces);


Other related posts:

  • » [haiku-commits] haiku: hrev47613 - src/kits/tracker - stpere