From c127772dc115717f8ca2e0c08d69d92c70b28a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Fri, 9 Mar 2018 17:06:41 +0100 Subject: [PATCH] Fix themes for AppImage --- .travis.yml | 4 ++++ src/Main.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3047d5873..f577d00ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -98,6 +98,10 @@ before_script: - cd radare2 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sed -i 's,R2_PREFIX.*,R2_PREFIX "/tmp/.cutter_usr",' libr/include/r_userconf.h.acr; + sed -i 's,R2_DATDIR.*,R2_DATDIR "/tmp/.cutter_usr/share",' libr/include/r_userconf.h.acr; + echo "Modified r_userconf.h.acr:"; + cat libr/include/r_userconf.h.acr; + echo "-----------------------------"; INSTALL_TARGET=install sys/install.sh; else LDFLAGS=-headerpad_max_install_names INSTALL_TARGET=install sys/install.sh; diff --git a/src/Main.cpp b/src/Main.cpp index ff1526b47..6ce73600e 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -27,13 +27,13 @@ void set_appimage_symlink() int main(int argc, char *argv[]) { - CutterApplication a(argc, argv); - // Hack to make it work with AppImage #ifdef APPIMAGE set_appimage_symlink(); #endif + CutterApplication a(argc, argv); + int ret = a.exec(); #ifdef APPIMAGE