Merge lp:~timur-adamow/wicd/wicd into lp:wicd/1.6

[Timur]

Fix bug #1184629

Due to the bug #1184629, wicd-curses could crash after trying to find the index of the current bitrate and use it in a bitrate combobox. With this fix, wicd-curses will not attempt to select current bitrate if there is no current bitrate.

[lp:~timur-adamow/wicd/wicd]

992. By Timur Adamov <email address hidden> on 2018-07-23

Fix bug #1184629

[Guido Maria Serra (zeph1ro)]

sorry Timur, I saw this now (I recently took over the project)

would you mind opening a new pull request against the git repo? (i just migrated from bzr)

[Timur (timur-adamow)]

> sorry Timur, I saw this now (I recently took over the project)
>
> would you mind opening a new pull request against the git repo? (i just
> migrated from bzr)

Thanks for the response.

I did what you asked me to. New pull request is available at https://code.launchpad.net/~timur-adamow/wicd/+git/wicd/+merge/373785.

Unmerged revisions

992. By Timur Adamov <email address hidden> on 2018-07-23

Fix bug #1184629

=== modified file 'curses/netentry_curses.py'
--- curses/netentry_curses.py	2012-11-17 18:12:25 +0000
+++ curses/netentry_curses.py	2018-07-23 11:00:29 +0000
@@ -538,11 +538,9 @@
         self.bitrates = wireless.GetAvailableBitrates()
         self.bitrates.append('auto')
         self.bitrate_combo.set_list(self.bitrates)
-        self.bitrate_combo.set_focus(
-            self.bitrates.index(
-                wireless.GetWirelessProperty(networkID, 'bitrate')
-            )
-        )
+        network_bitrate = wireless.GetWirelessProperty(networkID, 'bitrate')
+        if (network_bitrate is not None):
+            self.bitrate_combo.set_focus(self.bitrates.index(network_bitrate))
         self.allow_lower_bitrates_chkbox.set_state(
             to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
         )