projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
888c9a7
)
Don't die when main icon cannot be loaded
author
Christoph Sommer
<mail@christoph-sommer.de>
Mon, 23 Jun 2008 18:44:09 +0000
(18:44 +0000)
committer
Christoph Sommer
<mail@christoph-sommer.de>
Mon, 23 Jun 2008 18:44:09 +0000
(18:44 +0000)
SVN-Revision: 5620
src/main.cpp
patch
|
blob
|
history
diff --git
a/src/main.cpp
b/src/main.cpp
index
6acd08c
..
ed1317e
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-422,14
+422,20
@@
void init_video()
#else
const char* icon_fname = "images/engine/icons/supertux.xpm";
#endif
#else
const char* icon_fname = "images/engine/icons/supertux.xpm";
#endif
- SDL_Surface* icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true);
+ SDL_Surface* icon;
+ try {
+ icon = IMG_Load_RW(get_physfs_SDLRWops(icon_fname), true);
+ } catch (const std::runtime_error& err) {
+ icon = 0;
+ log_warning << "Couldn't load icon '" << icon_fname << "': " << err.what() << std::endl;
+ }
if(icon != 0) {
SDL_WM_SetIcon(icon, 0);
SDL_FreeSurface(icon);
}
#ifdef DEBUG
else {
if(icon != 0) {
SDL_WM_SetIcon(icon, 0);
SDL_FreeSurface(icon);
}
#ifdef DEBUG
else {
- log_warning << "Couldn't
fin
d icon '" << icon_fname << "'" << std::endl;
+ log_warning << "Couldn't
loa
d icon '" << icon_fname << "'" << std::endl;
}
#endif
}
#endif