diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:33 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:33 +0200 |
| commit | 6fcfe73ca751f068978ce201094b17cf2dfe4d20 (patch) | |
| tree | e7d85e8f9057430b480cd0e2f5ccb43c9d2ef8f8 /library | |
| parent | 3.15 (diff) | |
| download | FreeFileSync-6fcfe73ca751f068978ce201094b17cf2dfe4d20.tar.gz FreeFileSync-6fcfe73ca751f068978ce201094b17cf2dfe4d20.tar.bz2 FreeFileSync-6fcfe73ca751f068978ce201094b17cf2dfe4d20.zip | |
3.16
Diffstat (limited to 'library')
| -rw-r--r-- | library/process_xml.h | 2 | ||||
| -rw-r--r-- | library/statistics.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/library/process_xml.h b/library/process_xml.h index 589865a2..d627fc18 100644 --- a/library/process_xml.h +++ b/library/process_xml.h @@ -161,7 +161,7 @@ struct XmlGlobalSettings { //default external apps will be translated "on the fly"!!! #ifdef FFS_WIN - externelApplications.push_back(std::make_pair(wxT("Open with Explorer"), //mark for extraction: _("Open with Explorer") + externelApplications.push_back(std::make_pair(wxT("Show in Explorer"), //mark for extraction: _("Show in Explorer") wxT("explorer /select, \"%name\""))); externelApplications.push_back(std::make_pair(wxT("Open with default application"), //mark for extraction: _("Open with default application") wxT("cmd /c start \"\" \"%name\""))); diff --git a/library/statistics.cpp b/library/statistics.cpp index cb68d1de..d5cce670 100644 --- a/library/statistics.cpp +++ b/library/statistics.cpp @@ -144,7 +144,10 @@ void Statistics::addMeasurement(int objectsCurrent, double dataCurrent) //insert new record if (!measurements.empty()) - measurements.insert(--measurements.end(), newEntry); //use fact that time is monotonously ascending + { + //assert(dataCurrent >= (--measurements.end())->second.data); + measurements.insert(--measurements.end(), newEntry); //use fact that time is monotonously ascending + } else measurements.insert(newEntry); |