Probably fixed crash

presentation
Andreas Butti 7 years ago
parent 5ff2523474
commit 65ae146bc9
  1. 3
      src/gui/inputdevices/touchdisable/TouchDisableX11.h
  2. 4
      src/util/Path.cpp
  3. 4
      src/util/Path.h
  4. 6
      src/util/Util.cpp

@ -15,8 +15,7 @@
#include "TouchDisableInterface.h"
// Disabled at the moment, may cause issues
//#define X11_ENABLED
#define X11_ENABLED
#ifdef WIN32
#undef X11_ENABLED

@ -130,7 +130,7 @@ void Path::clearExtensions()
/**
* Return the Path as String
*/
string Path::str()
const string Path::str() const
{
return path;
}
@ -138,7 +138,7 @@ string Path::str()
/**
* Return the Path as String
*/
const char* Path::c_str()
const char* Path::c_str() const
{
return path.c_str();
}

@ -78,12 +78,12 @@ public:
/**
* Return the Path as String
*/
string str();
const string str() const;
/**
* Return the Path as String
*/
const char* c_str();
const char* c_str() const;
/**
* Get the parent path

@ -93,8 +93,10 @@ Path Util::getConfigSubfolder(Path subfolder)
{
if (g_mkdir_with_parents(p.c_str(), 0700))
{
string msg = FS(_F("Could not create folder: {1}") % p.str());
XojMsgBox::showErrorToUser(NULL, msg);
Util::execInUiThread([=]() {
string msg = FS(_F("Could not create folder: {1}") % p.str());
XojMsgBox::showErrorToUser(NULL, msg);
});
}
}

Loading…
Cancel
Save