summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-01-18 08:20:13 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-01-18 08:20:13 +0100
commitf900ffb5c737064f9c0b2d5eecf6b325fa0ba21d (patch)
tree2fc5f9e9150b755a5c9339f926d21254803fea92
parent81d378f9c550f7f1be292af65a8586bb8f769c4c (diff)
fix selecting no filter
-rw-r--r--api/plugin-support.hpp2
-rw-r--r--logic/runtime-libraries.cpp2
-rw-r--r--variant/default/main-window.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/api/plugin-support.hpp b/api/plugin-support.hpp
index 999a929a..ab41dcd2 100644
--- a/api/plugin-support.hpp
+++ b/api/plugin-support.hpp
@@ -183,7 +183,7 @@ private:
}
}
}
- return QString();
+ return {""};
}
bool check(bool fail)
diff --git a/logic/runtime-libraries.cpp b/logic/runtime-libraries.cpp
index 097540c2..82a148fe 100644
--- a/logic/runtime-libraries.cpp
+++ b/logic/runtime-libraries.cpp
@@ -41,7 +41,7 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli
goto end;
}
- if (f && !pFilter)
+ if (f && f->Constructor && !pFilter)
{
qDebug() << "filter load failure";
goto end;
diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp
index 9f050d71..8edf9f33 100644
--- a/variant/default/main-window.cpp
+++ b/variant/default/main-window.cpp
@@ -64,7 +64,7 @@ main_window::main_window() : State(OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH)
// fill dylib comboboxen
{
- modules.filters().push_front(std::make_shared<dylib>(QString(), dylib::Filter));
+ modules.filters().push_front(std::make_shared<dylib>("", dylib::Filter));
for (dylib_ptr& x : modules.trackers())
ui.iconcomboTrackerSource->addItem(x->icon, x->name, x->module_name);