From d9e4cd1086b235bb2082411d1f9f516a120f9cd4 Mon Sep 17 00:00:00 2001
From: Markus Hitter <mah@jump-ing.de>
Date: Wed, 15 Jul 2015 22:21:10 +0200
Subject: [PATCH] Configtool: let the parsing method decide what a name is.

This is mostly for code robustness.
---
 configtool/boardpanel.py   | 7 +++++--
 configtool/printerpanel.py | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py
index bbc0547..ba47194 100644
--- a/configtool/boardpanel.py
+++ b/configtool/boardpanel.py
@@ -291,8 +291,8 @@ class BoardPanel(wx.Panel):
       if self.parseCandidateValues(ln):
         continue
 
-      elif ln.lstrip().startswith("#define"):
-        self.parseDefineName(ln)
+      if self.parseDefineName(ln):
+        continue
 
     # Ignore candidates in the metadata file.
     self.candHeatPins = []
@@ -370,6 +370,9 @@ class BoardPanel(wx.Panel):
       t = m.groups()
       if len(t) == 1:
         self.cfgNames.append(t[0])
+      return True
+
+    return False
 
   def parseDefineValue(self, ln):
     m = reDefQS.search(ln)
diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py
index 0b7a14d..110922e 100644
--- a/configtool/printerpanel.py
+++ b/configtool/printerpanel.py
@@ -242,7 +242,8 @@ class PrinterPanel(wx.Panel):
         ln = prevLines + ln
         prevLines = ""
 
-      self.parseDefineName(ln)
+      if self.parseDefineName(ln):
+        continue
 
     prevLines = ""
     for ln in self.userBuffer:
@@ -282,6 +283,9 @@ class PrinterPanel(wx.Panel):
       t = m.groups()
       if len(t) == 1:
         self.cfgNames.append(t[0])
+      return True
+
+    return False
 
   def parseDefineValue(self, ln):
     if ln.lstrip().startswith("#define"):