summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-21 17:37:09 +0100
committerinfirit <[email protected]>2014-11-22 20:25:30 +0100
commit8db526f6f913aef0cba921e3e0911833f7a6dff4 (patch)
tree1ff6ef3d23a7cf01d40523fa09abed208a97eb71 /src
parent28c596789cf64a2df0005362b1595a73f0ab2567 (diff)
downloadengrampa-8db526f6f913aef0cba921e3e0911833f7a6dff4.tar.bz2
engrampa-8db526f6f913aef0cba921e3e0911833f7a6dff4.tar.xz
do not reload the archive if the operation was canceled
Based on FR commit: fce07b555afa34a17ce7faf6c7936915a3bf250b From: Paolo Bacchilega <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/fr-window.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fr-window.c b/src/fr-window.c
index b462077..5219e74 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -3180,7 +3180,8 @@ action_performed (FrArchive *archive,
case FR_ACTION_DELETING_FILES:
close_progress_dialog (window, FALSE);
- fr_window_archive_reload (window);
+ if (error->type != FR_PROC_ERROR_STOPPED)
+ fr_window_archive_reload (window);
return;
case FR_ACTION_ADDING_FILES:
@@ -3196,7 +3197,7 @@ action_performed (FrArchive *archive,
window->priv->archive_new = FALSE;
fr_window_add_to_recent_list (window, window->priv->archive_uri);
}
- if (! window->priv->batch_mode) {
+ if (! window->priv->batch_mode && (error->type != FR_PROC_ERROR_STOPPED)) {
fr_window_archive_reload (window);
return;
}