Merge lp:~wenchien/ubiquity/precise-proposed.lp944614 into lp:~ubuntu-installer/ubiquity/precise-proposed

[Jesse Sung]

[Colin Watson (cjwatson)]

I feel this needs more investigation for the same reason as:

  https://code.launchpad.net/~wenchien/ubiquity/ubiquity.lp944614/+merge/143250

review: Disapprove

[Dimitri John Ledkov (xnox)]

Stgraber wrote in the other proposal:
"I believe the right way to fix this bug is to cancel the timeouts when moving away from the page.
I pushed a change doing that to trunk and confirmed that it fixes the bug."

review: Disapprove

Unmerged revisions

5430. By Jesse Sung on 2013-01-15

Make sure dbfilter is not None before using it. (LP: #944614)

=== modified file 'ubiquity/plugins/ubi-console-setup.py'
--- ubiquity/plugins/ubi-console-setup.py	2012-03-27 00:15:43 +0000
+++ ubiquity/plugins/ubi-console-setup.py	2013-01-15 08:53:43 +0000
@@ -134,7 +134,7 @@
     def keyboard_variant_timeout(self, *args):
         layout = self.get_keyboard()
         variant = self.get_keyboard_variant()
-        if layout is not None and variant is not None:
+        if layout is not None and variant is not None and self.controller.dbfilter is not None:
             self.controller.dbfilter.apply_keyboard(layout, variant)
         return False