Skip to content

Commit 6172b8b

Browse files
committed
Better displaying of errors
1 parent a91ef6b commit 6172b8b

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

appimageupdategui/progress.vala

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,16 +168,16 @@ public class ProgressWindow : Window {
168168
btn_show_files.set_visible(true);
169169
}
170170

171-
if(line.contains("Cannot")) {
172-
revealer1.set_reveal_child (false);
173-
revealer2.set_reveal_child (true);
174-
icon_image.icon_name="dialog-error-symbolic";
171+
if(line.contains("Cannot") || line.contains("Error")) {
172+
display_error();
175173
}
176174
} catch (IOChannelError e) {
177175
stdout.printf ("%s: IOChannelError: %s\n", stream_name, e.message);
176+
display_error();
178177
return false;
179178
} catch (ConvertError e) {
180179
stdout.printf ("%s: ConvertError: %s\n", stream_name, e.message);
180+
display_error();
181181
return false;
182182
}
183183

@@ -194,17 +194,29 @@ public class ProgressWindow : Window {
194194
channel.read_line (out line, null, null);
195195
stdout.printf(line); // Be verbose
196196
message_label.label = line.substring(0, line.length - 1);
197+
if(line.contains("Cannot") || line.contains("Error")) {
198+
display_error();
199+
}
197200

198201
} catch (IOChannelError e) {
199202
stdout.printf ("%s: IOChannelError: %s\n", stream_name, e.message);
203+
display_error();
200204
return false;
201205
} catch (ConvertError e) {
202206
stdout.printf ("%s: ConvertError: %s\n", stream_name, e.message);
207+
display_error();
203208
return false;
204209
}
205210

206211
return true;
207212
}
213+
214+
private void display_error() {
215+
revealer1.set_reveal_child (false);
216+
revealer2.set_reveal_child (true);
217+
progress.set_fraction(0.0);
218+
icon_image.icon_name="dialog-error-symbolic";
219+
}
208220

209221
private void show_files() {
210222
print(result_file_name);

0 commit comments

Comments
 (0)