From 3225b24e3ef6ec40bdfa45fdf92714483591a0e9 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 30 Oct 2015 10:14:46 +0100
Subject: wine: fix install wrapper

---
 proto-wine/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt
index bafcff8b..71443b82 100644
--- a/proto-wine/CMakeLists.txt
+++ b/proto-wine/CMakeLists.txt
@@ -20,7 +20,7 @@ if(NOT WIN32)
             add_custom_target(wine-wrapper ALL DEPENDS opentrack-wrapper-wine.exe.so)
             add_dependencies(opentrack-proto-wine wine-wrapper)
             add_dependencies(wine-wrapper opentrack-compat)
-            install(FILES "${CMAKE_BINARY_DIR}/opentrack-wrapper-wine.exe.so" DESTINATION .)
+            install(FILES "${CMAKE_CURRENT_BINARY_DIR}/opentrack-wrapper-wine.exe.so" DESTINATION .)
         endif()
     endif()
 endif()
-- 
cgit v1.2.3


From 841b33bd05d384c0f3a642ee2ad2c78bf98e876c Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 30 Oct 2015 10:26:16 +0100
Subject: shortcuts: fix crash on Linux

---
 opentrack/shortcuts.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/opentrack/shortcuts.cpp b/opentrack/shortcuts.cpp
index 91d449f1..a33cf088 100644
--- a/opentrack/shortcuts.cpp
+++ b/opentrack/shortcuts.cpp
@@ -115,15 +115,17 @@ void KeybindingWorker::run() {
 void Shortcuts::bind_keyboard_shortcut(K &key, key_opts& k)
 {
 #if !defined(_WIN32)
-    if (!key)
-        key = std::make_shared<QxtGlobalShortcut>();
-    else {
-        key->setShortcut(QKeySequence::UnknownKey);
+    using sh = QxtGlobalShortcut;
+    if (key)
+    {
         key->setEnabled(false);
-        std::shared_ptr<QxtGlobalShortcut> ptr = K();
-        key.swap(ptr);
+        key->setShortcut(QKeySequence::UnknownKey);
+        std::shared_ptr<sh> tmp(nullptr);
+        key.swap(tmp);
     }
 
+    key = std::make_shared<sh>();
+
     if (k.keycode != "")
     {
         key->setShortcut(QKeySequence::fromString(k.keycode, QKeySequence::PortableText));
-- 
cgit v1.2.3