summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@redhat.com>2009-02-16 16:55:30 +0100
committerTomas Bzatek <tbzatek@redhat.com>2009-02-16 16:55:30 +0100
commitfb55089673387a6bbe0071cd5e40dd5d2eae2143 (patch)
tree40da5817a9374e46dbe111ba4aa923cc158d5899
parent817ac490adcbdb8d739f11999c7665675d5d5223 (diff)
downloadnautilus-gdu-fb55089673387a6bbe0071cd5e40dd5d2eae2143.tar.gz
nautilus-gdu-fb55089673387a6bbe0071cd5e40dd5d2eae2143.tar.xz
nautilus-gdu-fb55089673387a6bbe0071cd5e40dd5d2eae2143.zip
Don't cancel UI operation when combo box changes
-rw-r--r--TODO2
-rw-r--r--src/nautilus-gdu-window.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/TODO b/TODO
index 243d91d..c207336 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,7 @@ Short-term:
DONE - make a Fedora package
DONE, NEEDS_TESTING - !! set partition type too !! (only for MBR?)
OK - check label length before formatting (should be done automatically) -- DK returning wrong values for FAT and NTFS
- - get rid of the Revert button
+ DONE - get rid of the Revert button
Standalone mode:
DONE - refresh volume selector on hotplug/unplug
diff --git a/src/nautilus-gdu-window.c b/src/nautilus-gdu-window.c
index 296716e..8fe5120 100644
--- a/src/nautilus-gdu-window.c
+++ b/src/nautilus-gdu-window.c
@@ -1239,9 +1239,12 @@ volume_selector_combo_box_changed (GtkWidget *combo_box, FormatDialogPrivate *pr
g_return_if_fail (priv != NULL);
presentable = gdu_util_presentable_combo_box_get_selected (priv->volume_selector);
- set_new_presentable (priv, presentable);
- update_ui (priv);
- update_ui_progress (priv, NULL, FALSE);
+ if (presentable != priv->presentable) {
+ set_new_presentable (priv, presentable);
+ update_ui (priv);
+ if (! priv->job_running)
+ update_ui_progress (priv, NULL, FALSE);
+ }
if (presentable)
g_object_unref (presentable);
}