summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratislav Podzimek <vpodzime@redhat.com>2012-10-12 17:00:26 +0200
committerVratislav Podzimek <vpodzime@redhat.com>2012-10-16 09:50:45 +0200
commit114f158eeb6518d9bdf5b6dda26dcdc209c658bb (patch)
tree42e8ac7814e3d252b2f5a16a9165fcc0930aff8d
parent799d526f3b8a0586c5c716ae1adf9af79883d9de (diff)
downloadanaconda-114f158eeb6518d9bdf5b6dda26dcdc209c658bb.tar.gz
anaconda-114f158eeb6518d9bdf5b6dda26dcdc209c658bb.tar.xz
anaconda-114f158eeb6518d9bdf5b6dda26dcdc209c658bb.zip
Do not remove the layout if it was added back (#865830)
When replacing the last layout in the list, user may mark the same layout (among the others) for adding. In such cases we shouldn't remove the layout from the list and just leave it where it was.
-rw-r--r--pyanaconda/ui/gui/spokes/keyboard.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 3dce1d7b7..fd9e6abea 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -280,7 +280,8 @@ class KeyboardSpoke(NormalSpoke):
if self._remove_last_attempt:
itr = self._store.get_iter_first()
- self._removeLayout(self._store, itr)
+ if not self._store[itr][0] in dialog.chosen_layouts:
+ self._removeLayout(self._store, itr)
self._remove_last_attempt = False
def _run_add_from_removed(self, button):