diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index ab3c039..e1ef955 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -265,7 +265,11 @@ class BoardPanel(wx.Panel): prevLines = "" self.parseDefineName(ln) + self.parseDefineValue(ln) + # Read the user configuration. This usually overwrites all of the items + # read above, but not those missing in the user configuration, e.g. + # when reading an older config. gatheringHelpText = False prevLines = "" for ln in self.userBuffer: diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py index f52b7c5..f976985 100644 --- a/configtool/printerpanel.py +++ b/configtool/printerpanel.py @@ -230,7 +230,11 @@ class PrinterPanel(wx.Panel): prevLines = "" self.parseDefineName(ln) + self.parseDefineValue(ln) + # Read the user configuration. This usually overwrites all of the items + # read above, but not those missing in the user configuration, e.g. + # when reading an older config. gatheringHelpText = False prevLines = "" for ln in self.userBuffer: @@ -251,8 +255,7 @@ class PrinterPanel(wx.Panel): ln = prevLines + ln prevLines = "" - if self.parseDefineValue(ln): - continue + self.parseDefineValue(ln) # Parsing done. All parsed stuff is now in these arrays and dicts. # Uncomment for debugging.