Skip to content
Snippets Groups Projects
Commit 8fc6fb5a authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'bugs-2423' into 'master'

[*] Fixed crash of the gui-client when rewriting logs.

See merge request cellframe/kelvin-dashboard!4
parents 28eb078c 3479784f
No related branches found
No related tags found
1 merge request!4[*] Fixed crash of the gui-client when rewriting logs.
...@@ -110,7 +110,7 @@ void DapServiceController::processGetNodeLogs(const QStringList &aNodeLogs) ...@@ -110,7 +110,7 @@ void DapServiceController::processGetNodeLogs(const QStringList &aNodeLogs)
if(x != aNodeLogs.size()) if(x != aNodeLogs.size())
--x; --x;
} }
else else if( x != aNodeLogs.size())
{ {
list.append(aNodeLogs[x]); list.append(aNodeLogs[x]);
++counter; ++counter;
......
...@@ -23,7 +23,6 @@ win32 { ...@@ -23,7 +23,6 @@ win32 {
else { else {
VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT
DEFINES += CLI_PATH=\\\"/opt/kelvin-node/bin/kelvin-node-cli\\\" DEFINES += CLI_PATH=\\\"/opt/kelvin-node/bin/kelvin-node-cli\\\"
DEFINES += LOG_FILE=\\\"/opt/kelvin-node/bin/kelvin-node_logs.txt\\\"
} }
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use
......
...@@ -25,7 +25,7 @@ win32 { ...@@ -25,7 +25,7 @@ win32 {
else { else {
VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT VERSION = $$VER_MAJ\.$$VER_MIN\-$$VER_PAT
DEFINES += CLI_PATH=\\\"/opt/kelvin-node/bin/kelvin-node-cli\\\" DEFINES += CLI_PATH=\\\"/opt/kelvin-node/bin/kelvin-node-cli\\\"
DEFINES += LOG_FILE=\\\"/opt/kelvin-node/bin/kelvin-node_logs.txt\\\" DEFINES += LOG_FILE=\\\"/opt/kelvin-node/kelvin-node_logs.txt\\\"
} }
# The following define makes your compiler emit warnings if you use # The following define makes your compiler emit warnings if you use
......
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