1.6.3a
This commit is contained in:
parent
3b90c9ee6c
commit
cb5043490a
|
@ -12,7 +12,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
### Fixed
|
### Fixed
|
||||||
- fixed issue with auto delete sandbox on SandMan startup [#2555](https://github.com/sandboxie-plus/Sandboxie/issues/2555)
|
- fixed issue with auto delete sandbox on SandMan startup [#2555](https://github.com/sandboxie-plus/Sandboxie/issues/2555)
|
||||||
- fixed issue with Windows 11 context menu when SandMan was not already running [#2284](https://github.com/sandboxie-plus/Sandboxie/issues/2284)
|
- fixed issue with Windows 11 context menu when SandMan was not already running [#2284](https://github.com/sandboxie-plus/Sandboxie/issues/2284)
|
||||||
|
- fixed issue with the display about cmbDefault [#2560](https://github.com/sandboxie-plus/Sandboxie/pull/2560) (okrc)
|
||||||
|
- fixed issuw with templates.ini loading on first start [#2574](https://github.com/sandboxie-plus/Sandboxie/issues/2574)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -204,7 +204,7 @@ _FX NTSTATUS Conf_Read(ULONG session_id)
|
||||||
ULONG path_len;
|
ULONG path_len;
|
||||||
WCHAR *path = NULL;
|
WCHAR *path = NULL;
|
||||||
BOOLEAN path_home;
|
BOOLEAN path_home;
|
||||||
STREAM *stream;
|
STREAM *stream = NULL;
|
||||||
POOL *pool;
|
POOL *pool;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -247,6 +247,7 @@ _FX NTSTATUS Conf_Read(ULONG session_id)
|
||||||
status == STATUS_OBJECT_PATH_NOT_FOUND)
|
status == STATUS_OBJECT_PATH_NOT_FOUND)
|
||||||
{
|
{
|
||||||
Log_Msg_Session(MSG_CONF_NO_FILE, NULL, NULL, session_id);
|
Log_Msg_Session(MSG_CONF_NO_FILE, NULL, NULL, session_id);
|
||||||
|
status = STATUS_SUCCESS; // we need to continue and load the Templates.ini with the defaults
|
||||||
} else {
|
} else {
|
||||||
wcscpy(linenum_str, L"(none)");
|
wcscpy(linenum_str, L"(none)");
|
||||||
Log_Status_Ex_Session(
|
Log_Status_Ex_Session(
|
||||||
|
@ -281,6 +282,8 @@ _FX NTSTATUS Conf_Read(ULONG session_id)
|
||||||
data.home = path_home;
|
data.home = path_home;
|
||||||
data.use_count = 0;
|
data.use_count = 0;
|
||||||
|
|
||||||
|
if (stream) {
|
||||||
|
|
||||||
status = Stream_Read_BOM(stream, &data.encoding);
|
status = Stream_Read_BOM(stream, &data.encoding);
|
||||||
|
|
||||||
linenum = 1;
|
linenum = 1;
|
||||||
|
@ -289,8 +292,9 @@ _FX NTSTATUS Conf_Read(ULONG session_id)
|
||||||
if (status == STATUS_END_OF_FILE)
|
if (status == STATUS_END_OF_FILE)
|
||||||
status = STATUS_SUCCESS;
|
status = STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Stream_Close(stream);
|
if (stream) Stream_Close(stream);
|
||||||
|
|
||||||
//
|
//
|
||||||
// read (Home Path)\Templates.ini
|
// read (Home Path)\Templates.ini
|
||||||
|
|
Loading…
Reference in New Issue