diff options
Diffstat (limited to 'apps/gui/statusbar-skinned.c')
-rw-r--r-- | apps/gui/statusbar-skinned.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index f8e06c2b5d..9b10ad4dce 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c | |||
@@ -86,14 +86,15 @@ int sb_preproccess(enum screen_type screen, struct wps_data *data) | |||
86 | int sb_postproccess(enum screen_type screen, struct wps_data *data) | 86 | int sb_postproccess(enum screen_type screen, struct wps_data *data) |
87 | { | 87 | { |
88 | if (data->wps_loaded) | 88 | if (data->wps_loaded) |
89 | { | 89 | { |
90 | /* hide the sb's default viewport because it has nasty effect with stuff | 90 | /* hide the sb's default viewport because it has nasty effect with stuff |
91 | * not part of the statusbar, | 91 | * not part of the statusbar, |
92 | * hence .sbs's without any other vps are unsupported*/ | 92 | * hence .sbs's without any other vps are unsupported*/ |
93 | struct skin_viewport *vp = skin_find_item(VP_DEFAULT_LABEL_STRING, SKIN_FIND_VP, data); | 93 | struct skin_viewport *vp = skin_find_item(VP_DEFAULT_LABEL_STRING, SKIN_FIND_VP, data); |
94 | struct skin_element *tree = SKINOFFSETTOPTR(get_skin_buffer(data), data->tree); | 94 | struct skin_element *tree = SKINOFFSETTOPTR(get_skin_buffer(data), data->tree); |
95 | struct skin_element *next_vp = SKINOFFSETTOPTR(get_skin_buffer(data), tree->next); | 95 | struct skin_element *next_vp = NULL; |
96 | 96 | if (tree) next_vp = SKINOFFSETTOPTR(get_skin_buffer(data), tree->next); | |
97 | |||
97 | if (vp) | 98 | if (vp) |
98 | { | 99 | { |
99 | if (!next_vp) | 100 | if (!next_vp) |
@@ -132,9 +133,12 @@ struct viewport *sb_skin_get_info_vp(enum screen_type screen) | |||
132 | viewportmanager_theme_enable(screen, false, NULL); | 133 | viewportmanager_theme_enable(screen, false, NULL); |
133 | viewportmanager_theme_undo(screen, true); | 134 | viewportmanager_theme_undo(screen, true); |
134 | } | 135 | } |
135 | label = SKINOFFSETTOPTR(get_skin_buffer(data), infovp_label[screen]); | ||
136 | if (infovp_label[screen] == VP_DEFAULT_LABEL) | 136 | if (infovp_label[screen] == VP_DEFAULT_LABEL) |
137 | label = VP_DEFAULT_LABEL_STRING; | 137 | label = VP_DEFAULT_LABEL_STRING; |
138 | else | ||
139 | label = SKINOFFSETTOPTR(get_skin_buffer(data), infovp_label[screen]); | ||
140 | if (!label) | ||
141 | return NULL; | ||
138 | vp = skin_find_item(label, SKIN_FIND_UIVP, data); | 142 | vp = skin_find_item(label, SKIN_FIND_UIVP, data); |
139 | if (!vp) | 143 | if (!vp) |
140 | return NULL; | 144 | return NULL; |