Merge branch 'master' into uikit

This commit is contained in:
Tomasz Sowa 2021-01-25 17:59:14 +01:00
commit f6077da614
2 changed files with 10 additions and 3 deletions

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -42,7 +42,7 @@ namespace Winix
#define WINIX_VER_MAJOR 0
#define WINIX_VER_MINOR 7
#define WINIX_VER_REVISION 0
#define WINIX_VER_REVISION 1

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2018, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -118,6 +118,13 @@ FunctionBase * Functions::Find(const std::wstring & function_name)
if( i == table.end() )
return 0;
FunctionBase * fun = i->second;
// this is to set 'cur' and 'locale' for slog, but in the future slog will be moved to Session
fun->set_cur(cur);
fun->set_locale(locale);
//
return i->second;
}