diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/icon.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 299af5d0f4..b0e1ba9ce0 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -198,8 +198,7 @@ enum Iconset { | |||
198 | #endif | 198 | #endif |
199 | }; | 199 | }; |
200 | 200 | ||
201 | static void load_icons(const char* filename, enum Iconset iconset, | 201 | static void load_icons(const char* filename, enum Iconset iconset) |
202 | bool allow_disable) | ||
203 | { | 202 | { |
204 | int size_read; | 203 | int size_read; |
205 | bool *loaded_ok = NULL; | 204 | bool *loaded_ok = NULL; |
@@ -235,7 +234,7 @@ static void load_icons(const char* filename, enum Iconset iconset, | |||
235 | } | 234 | } |
236 | 235 | ||
237 | *loaded_ok = false; | 236 | *loaded_ok = false; |
238 | if (!allow_disable || (filename[0] && filename[0] != '-')) | 237 | if (filename[0] && filename[0] != '-') |
239 | { | 238 | { |
240 | char path[MAX_PATH]; | 239 | char path[MAX_PATH]; |
241 | 240 | ||
@@ -251,32 +250,34 @@ static void load_icons(const char* filename, enum Iconset iconset, | |||
251 | 250 | ||
252 | void icons_init(void) | 251 | void icons_init(void) |
253 | { | 252 | { |
254 | load_icons(global_settings.icon_file, Iconset_Mainscreen, true); | 253 | load_icons(global_settings.icon_file, Iconset_Mainscreen); |
255 | 254 | ||
256 | if (*global_settings.viewers_icon_file) | 255 | if (global_settings.viewers_icon_file[0] && |
256 | global_settings.viewers_icon_file[0] != '-') | ||
257 | { | 257 | { |
258 | load_icons(global_settings.viewers_icon_file, | 258 | load_icons(global_settings.viewers_icon_file, |
259 | Iconset_Mainscreen_viewers, true); | 259 | Iconset_Mainscreen_viewers); |
260 | read_viewer_theme_file(); | 260 | read_viewer_theme_file(); |
261 | } | 261 | } |
262 | else | 262 | else |
263 | { | 263 | { |
264 | load_icons(DEFAULT_VIEWER_BMP, Iconset_Mainscreen_viewers, false); | 264 | load_icons(DEFAULT_VIEWER_BMP, Iconset_Mainscreen_viewers); |
265 | } | 265 | } |
266 | 266 | ||
267 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) | 267 | #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) |
268 | load_icons(global_settings.remote_icon_file, | 268 | load_icons(global_settings.remote_icon_file, |
269 | Iconset_Remotescreen, true); | 269 | Iconset_Remotescreen); |
270 | 270 | ||
271 | if (*global_settings.remote_viewers_icon_file) | 271 | if (global_settings.remote_viewers_icon_file[0] && |
272 | global_settings.remote_viewers_icon_file[0] != '-') | ||
272 | { | 273 | { |
273 | load_icons(global_settings.remote_viewers_icon_file, | 274 | load_icons(global_settings.remote_viewers_icon_file, |
274 | Iconset_Remotescreen_viewers, true); | 275 | Iconset_Remotescreen_viewers); |
275 | } | 276 | } |
276 | else | 277 | else |
277 | { | 278 | { |
278 | load_icons(DEFAULT_REMOTE_VIEWER_BMP, | 279 | load_icons(DEFAULT_REMOTE_VIEWER_BMP, |
279 | Iconset_Remotescreen_viewers, false); | 280 | Iconset_Remotescreen_viewers); |
280 | } | 281 | } |
281 | #endif | 282 | #endif |
282 | } | 283 | } |