fixing backported patch

Gbp-Dch: ignore

diff --git a/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch b/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch
index 9105ecb2a986aec7e51a21f287c83e7fcb009691..9f352a487c99b743a9221ad87190fc8d4c8b549b 100644 (file)
--- a/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch
+++ b/debian/patches/0010-Backported-fix-for-crash-when-saving-global-search-p.patch
@@ -8,7 +8,7 @@ Subject: Backported fix for crash when saving global-search-path from cmdline
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/extras/Projucer/Source/Application/jucer_CommandLine.cpp b/extras/Projucer/Source/Application/jucer_CommandLine.cpp
-index 4dfe6cf..48c7631 100644
+index 4dfe6cf..227895e 100644
 --- a/extras/Projucer/Source/Application/jucer_CommandLine.cpp
 +++ b/extras/Projucer/Source/Application/jucer_CommandLine.cpp
 @@ -733,6 +733,8 @@ namespace
@@ -16,7 +16,7 @@ index 4dfe6cf..48c7631 100644
          auto settingsFile = userAppData.getChildFile ("Projucer").getChildFile ("Projucer.settings");\r
          std::unique_ptr<XmlElement> xml (XmlDocument::parse (settingsFile));\r
 +        if (xml == nullptr)\r
-+            ConsoleApplication::fail ("Settings file not valid!");\r
++            throw CommandLineError ("Settings file not valid!");\r
          auto settingsTree = ValueTree::fromXml (*xml);\r
  \r
          if (! settingsTree.isValid())\r
@@ -33,7 +33,7 @@ index 4dfe6cf..48c7631 100644
 -                                     .getChildWithName ("FALLBACK_PATHS")\r
 -                                     .getChildWithName (args[1] + String ("Fallback"));\r
 +                                     .getOrCreateChildWithName ("FALLBACK_PATHS", nullptr)\r
-+                                     .getOrCreateChildWithName (args[1].text + "Fallback", nullptr);\r
++                                     .getOrCreateChildWithName (args[1] + String("Fallback"), nullptr);\r
          }\r
  \r
          if (! childToSet.isValid())\r