aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-28 09:27:22 +0100
committerDavid Robillard <d@drobilla.net>2019-03-28 09:27:22 +0100
commit524497ab3bd9fbc43d09105f611ef8d20afc495a (patch)
treeb042f7540090f937cec260ae4b9c93156b715514
parent76b2bef46c9e46bbff7d8dfe2ac5977e98d5f4dd (diff)
downloadingen-524497ab3bd9fbc43d09105f611ef8d20afc495a.tar.gz
ingen-524497ab3bd9fbc43d09105f611ef8d20afc495a.tar.bz2
ingen-524497ab3bd9fbc43d09105f611ef8d20afc495a.zip
Fix search for ingen_gui.ui
-rw-r--r--src/gui/WidgetFactory.cpp3
-rw-r--r--src/runtime_paths.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp
index 3a71425d..154bcd3f 100644
--- a/src/gui/WidgetFactory.cpp
+++ b/src/gui/WidgetFactory.cpp
@@ -60,8 +60,7 @@ WidgetFactory::find_ui_file()
return;
}
- throw std::runtime_error(fmt("Unable to find ingen_gui.ui in %1%\n",
- INGEN_DATA_DIR));
+ throw std::runtime_error("Unable to find ingen_gui.ui\n");
}
Glib::RefPtr<Gtk::Builder>
diff --git a/src/runtime_paths.cpp b/src/runtime_paths.cpp
index c4ee7c2b..2af0da45 100644
--- a/src/runtime_paths.cpp
+++ b/src/runtime_paths.cpp
@@ -111,7 +111,7 @@ bundle_file_path(const std::string& name)
FilePath
data_file_path(const std::string& name)
{
- return find_in_search_path(name, data_dirs());
+ return find_in_search_path(FilePath("ingen") / name, data_dirs());
}
std::vector<FilePath>