From 9123ae323037b93f15dd19682c88804de229c1ef Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sun, 13 Jun 2010 14:49:49 +0000 Subject: [PATCH] Fix pad configuration dialog on linux git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5676 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/FileUtil.cpp | 6 +++--- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++++ Source/Core/InputUICommon/Src/ConfigDiag.cpp | 3 ++- Source/Core/InputUICommon/Src/ConfigDiag.h | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 8e6006bb58..ee7032f16f 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -648,9 +648,9 @@ const char *GetUserPath(int DirIDX) // Keep the directory setup the way it was on windows snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); #elif defined (__linux__) - if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) - snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); - else +// if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR)) +// snprintf(UserDir, sizeof(UserDir), ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP); +// else snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME")); #else snprintf(UserDir, sizeof(UserDir), "%s" DIR_SEP DOLPHIN_DATA_DIR DIR_SEP, getenv("HOME")); diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 0fb8239ea6..2e3fc0d106 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -950,7 +950,11 @@ void CFrame::OnPluginPAD(wxCommandEvent& WXUNUSED (event)) was_init = true; else { +#if defined(HAVE_X11) && HAVE_X11 + GCPad_Init(X11Utils::XDisplayFromHandle(GetHandle())); +#else GCPad_Init(GetHandle()); +#endif } InputConfigDialog* m_ConfigFrame = new InputConfigDialog(this, *pad_plugin, "GCPadNew", was_init ); m_ConfigFrame->ShowModal(); diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp index c0b1e3fcc2..3d6675edc3 100644 --- a/Source/Core/InputUICommon/Src/ConfigDiag.cpp +++ b/Source/Core/InputUICommon/Src/ConfigDiag.cpp @@ -951,7 +951,8 @@ InputConfigDialog::InputConfigDialog( wxWindow* const parent, InputPlugin& plugi } -InputConfigDialog::~InputConfigDialog() +bool InputConfigDialog::Destroy() { m_update_timer->Stop(); + return true; } diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.h b/Source/Core/InputUICommon/Src/ConfigDiag.h index 686adeb636..ea72c0124b 100644 --- a/Source/Core/InputUICommon/Src/ConfigDiag.h +++ b/Source/Core/InputUICommon/Src/ConfigDiag.h @@ -224,7 +224,7 @@ class InputConfigDialog : public wxDialog public: InputConfigDialog( wxWindow* const parent, InputPlugin& plugin, const std::string& name, const bool _is_game_running ); - ~InputConfigDialog(); + bool Destroy(); void ClickSave( wxCommandEvent& event );