Skip to content
Snippets Groups Projects
Commit a7e4428d authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-17452 CEF not working in non-ASCII install path

Fix ASCII specific function
parent 397f401a
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "llplugininstance.h" #include "llplugininstance.h"
#include "llpluginmessage.h" #include "llpluginmessage.h"
#include "llpluginmessageclasses.h" #include "llpluginmessageclasses.h"
#include "llstring.h"
#include "volume_catcher.h" #include "volume_catcher.h"
#include "media_plugin_base.h" #include "media_plugin_base.h"
...@@ -616,9 +617,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string) ...@@ -616,9 +617,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
// dir as the executable that loaded it (SLPlugin.exe). The code in // dir as the executable that loaded it (SLPlugin.exe). The code in
// Dullahan that tried to figure out the location automatically uses // Dullahan that tried to figure out the location automatically uses
// the location of the exe which isn't helpful so we tell it explicitly. // the location of the exe which isn't helpful so we tell it explicitly.
char cur_dir_str[MAX_PATH]; std::vector<wchar_t> buffer(MAX_PATH + 1);
GetCurrentDirectoryA(MAX_PATH, cur_dir_str); GetCurrentDirectoryW(MAX_PATH, &buffer[0]);
settings.host_process_path = std::string(cur_dir_str); settings.host_process_path = ll_convert_wide_to_string(&buffer[0]);
#endif #endif
settings.accept_language_list = mHostLanguage; settings.accept_language_list = mHostLanguage;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment