From cae015805d459b2ca2668d0b7b8d1bd99b3e105e Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 26 Oct 2018 22:37:13 +0200 Subject: [PATCH] fixing backported patch Gbp-Dch: ignore --- ...ckported-fix-for-crash-when-saving-global-search-p.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 9105ecb2..9f352a48 100644 --- 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"); std::unique_ptr xml (XmlDocument::parse (settingsFile)); + if (xml == nullptr) -+ ConsoleApplication::fail ("Settings file not valid!"); ++ throw CommandLineError ("Settings file not valid!"); auto settingsTree = ValueTree::fromXml (*xml); if (! settingsTree.isValid()) @@ -33,7 +33,7 @@ index 4dfe6cf..48c7631 100644 - .getChildWithName ("FALLBACK_PATHS") - .getChildWithName (args[1] + String ("Fallback")); + .getOrCreateChildWithName ("FALLBACK_PATHS", nullptr) -+ .getOrCreateChildWithName (args[1].text + "Fallback", nullptr); ++ .getOrCreateChildWithName (args[1] + String("Fallback"), nullptr); } if (! childToSet.isValid()) -- 2.30.2