From 05d7db4e3e9b145e6cc13e1f91b765e5cff735da Mon Sep 17 00:00:00 2001 From: Garux Date: Sat, 7 Sep 2019 20:55:55 +0300 Subject: [PATCH] don't append excess slash to g_qeglobals.m_userGamePath --- radiant/entity.cpp | 2 +- radiant/entityinspector.cpp | 2 +- radiant/xywindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radiant/entity.cpp b/radiant/entity.cpp index 2d5e3da4..afea0f4a 100644 --- a/radiant/entity.cpp +++ b/radiant/entity.cpp @@ -593,7 +593,7 @@ const char* misc_model_dialog( GtkWidget* parent ){ if ( !file_readable( buffer.c_str() ) ) { // just go to fsmain buffer.clear(); - buffer << g_qeglobals.m_userGamePath.c_str() << "/"; + buffer << g_qeglobals.m_userGamePath.c_str(); } const char *filename = file_dialog( parent, TRUE, "Choose Model", buffer.c_str(), ModelLoader::Name() ); diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp index 6c9bdf92..227f86a7 100644 --- a/radiant/entityinspector.cpp +++ b/radiant/entityinspector.cpp @@ -330,7 +330,7 @@ const char* browse_sound( GtkWidget* parent ){ if ( !file_readable( buffer.c_str() ) ) { // just go to fsmain buffer.clear(); - buffer << g_qeglobals.m_userGamePath.c_str() << "/"; + buffer << g_qeglobals.m_userGamePath.c_str(); } const char* filename = file_dialog( parent, TRUE, "Open Wav File", buffer.c_str(), "sound" ); diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 05b4ee49..3b5ebaf7 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -1336,7 +1336,7 @@ const char* BackgroundImage::background_image_dialog(){ if ( !file_readable( buffer.c_str() ) ) { // just go to fsmain buffer.clear(); - buffer << g_qeglobals.m_userGamePath.c_str() << "/"; + buffer << g_qeglobals.m_userGamePath.c_str(); } const char *filename = file_dialog( GTK_WIDGET( MainFrame_getWindow() ), TRUE, "Background Image", buffer.c_str(), NULL );