From b3c0d2ead1f384b35615be562c5f06804e8990cb Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 31 Aug 2018 21:46:18 -0400 Subject: Fixed wchar_t not being null terminated Occasionally wierd characters would show in place of a window title or button label, this was due to whcar_t s missing their sentinal characters. --- src/client/lua_api/gui/iguifiledialog.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/client/lua_api/gui/iguifiledialog.cpp') diff --git a/src/client/lua_api/gui/iguifiledialog.cpp b/src/client/lua_api/gui/iguifiledialog.cpp index c277ce4..ad95b13 100644 --- a/src/client/lua_api/gui/iguifiledialog.cpp +++ b/src/client/lua_api/gui/iguifiledialog.cpp @@ -57,10 +57,6 @@ static int newfileopendialog(lua_State* L){ const char *pathc = lua_tostring(L,-1);//"title","path" lua_pop(L,1);//"title" path = (io::path::char_type*)pathc; - //size_t pathcslen = strlen(pathc); - //path = (wchar_t*)malloc(sizeof(wchar_t) * (pathcslen + 1));// +1 for null - //mbstowcs(path,pathc,pathcslen); - //path[pathcslen] = L'\0'; } if(nargs > 0){ const char *titlec = lua_tostring(L,-1); @@ -74,18 +70,18 @@ static int newfileopendialog(lua_State* L){ IGUIEnvironment *env = device->getGUIEnvironment(); IGUIFileOpenDialog *but = env->addFileOpenDialog(title,modal,parent,-1,false,path); - printf("Added file open dialog\n"); + //printf("Added file open dialog\n"); lua_newtable(L);//{} lua_pushlightuserdata(L,but);//{},ud_iguibutton lua_setfield(L,-2,"guielement");//{guielement} luaL_getmetatable(L,"gui.iguifileopendialog");//{guielement},{m_iguibutton} lua_setmetatable(L,-2);//{guielement} - printf("Created lua representation\n"); + //printf("Created lua representation\n"); setelementcallback(L,EGET_DIRECTORY_SELECTED,"onDirectory");// setelementcallback(L,EGET_FILE_SELECTED,"onFileSelected"); setelementcallback(L,EGET_FILE_CHOOSE_DIALOG_CANCELLED,"onCanceled"); - printf("Finished registering callback\n"); + //printf("Finished registering callback\n"); free(title); free(path); -- cgit v1.2.3-70-g09d2