From 06f133c1f2b16a3fffd00fe5a9a64cbfdbb55ab3 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Tue, 25 Feb 2014 14:42:34 -0500 Subject: [PATCH] ScreenSaverRunner: treat load_add_on return value like an image_id ... rather than a status_t, because that's what it is. --- src/kits/screensaver/ScreenSaverRunner.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/kits/screensaver/ScreenSaverRunner.cpp b/src/kits/screensaver/ScreenSaverRunner.cpp index d535ac5bc9..407881a936 100644 --- a/src/kits/screensaver/ScreenSaverRunner.cpp +++ b/src/kits/screensaver/ScreenSaverRunner.cpp @@ -122,14 +122,11 @@ ScreenSaverRunner::_LoadAddOn() continue; fAddonImage = load_add_on(path.Path()); - if (fAddonImage >= B_OK) + if (fAddonImage > 0) break; } - if (fAddonImage < B_OK) { - printf("Unable to open add-on: %s: %s\n", path.Path(), - strerror(fAddonImage)); - } else { + if (fAddonImage > 0) { // look for the one C function that should exist, // instantiate_screen_saver() if (get_image_symbol(fAddonImage, "instantiate_screen_saver", @@ -146,7 +143,8 @@ ScreenSaverRunner::_LoadAddOn() strerror(fSaver->InitCheck())); _CleanUp(); } - } + } else + printf("Unable to open add-on %s.\n", path.Path()); Resume(); }