mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 10:05:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'e7ac54c403392da2d0fd05f4979cae6250bed986' into v2019.11

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	doc/dox/whatsnew.dox
This commit is contained in:
jkriege2 2020-06-28 10:50:34 +02:00
commit 620ff7a790
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jkqtplotter/jkqtpbaseplotterstyle.cpp
View File

@ -103,7 +103,7 @@ void JKQTBasePlotterStyle::loadSettings(const QSettings &settings, const QString
QString kk=k;
kk.remove(0, start.size());
QString num="";
while (kk.at(0).isDigit()) {
while (!kk.isEmpty() && kk.at(0).isDigit()) {
num+=kk.at(0);
kk.remove(0, 1);
}

2
lib/jkqtplotter/jkqtplotterstyle.cpp
View File

@ -84,7 +84,7 @@ void JKQTPlotterStyle::loadSettings(const QSettings &settings, const QString &gr
QString kk=k;
kk.remove(0, start.size());
QString num="";
while (kk.at(0).isDigit()) {
while (!kk.isEmpty() && kk.at(0).isDigit()) {
num+=kk.at(0);
kk.remove(0, 1);
}