From 4db32a4d59dab34743640ca031429dd911d38d43 Mon Sep 17 00:00:00 2001 From: CMorley Date: Mon, 22 May 2023 20:24:22 -0700 Subject: [PATCH] pncconf -fix loading of 'discovered' firmware If one used 'discovery' to build a config, then reloade the config, It would fail. I think code not converted fro gtk2 to gtk3. Access to combo box's model is slightly different --- src/emc/usr_intf/pncconf/pncconf.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/emc/usr_intf/pncconf/pncconf.py b/src/emc/usr_intf/pncconf/pncconf.py index d8c58540825..de919ba800a 100755 --- a/src/emc/usr_intf/pncconf/pncconf.py +++ b/src/emc/usr_intf/pncconf/pncconf.py @@ -2140,10 +2140,10 @@ def init_mesa_options(self,boardnum): dbg('Looking for firmware data %s'%self.d["mesa%d_firmware"% boardnum]) found = False search = 0 - model = self.widgets["mesa%d_firmware"% boardnum].get_model() - for search,item in enumerate(model): - dbg('%d,%s'%(search,model[search][0])) - if model[search][0] == self.d["mesa%d_firmware"% boardnum]: + combo_model = self.widgets["mesa%d_firmware"% boardnum].get_model() + for search,item in enumerate(combo_model): + dbg('%d,%s'%(search,combo_model[search][0])) + if combo_model[search][0] == self.d["mesa%d_firmware"% boardnum]: self.widgets["mesa%d_firmware"% boardnum].set_active(search) found = True dbg('found firmware # %d'% search) @@ -2152,9 +2152,10 @@ def init_mesa_options(self,boardnum): dbg('firmware not found') cur_firm = self.d['mesa%d_currentfirmwaredata'% boardnum][_PD._FIRMWARE] dbg('looking for: %s'% cur_firm ) + combo = self.widgets["mesa%d_firmware"% boardnum] #self.widgets["mesa%d_firmware"% boardnum].set_active(0) self._p.MESA_FIRMWAREDATA.append(self.d['mesa%d_currentfirmwaredata'% boardnum]) - model.append((cur_firm,)) + combo.append_text(cur_firm) self.init_mesa_options(boardnum) return else: