nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jaime
2013-01-11 08:23:51 -05:00
parent 5d1908ea41 a959f7c9d4
commit 72d6cc7985
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ANT.cpp
View File

@@ -158,7 +158,8 @@ void ANT::setWheelRpm(float x) {
// devConf will be NULL if we are are running the add device wizard
// we can default to the global setting
if (devConf) telemetry.setSpeed(x * (devConf->wheelSize/1000) * 60 / 1000);
else telemetry.setSpeed(x * (appsettings->value(NULL, GC_WHEELSIZE, 2100).toInt()/1000) * 60 / 1000);
//else telemetry.setSpeed(x * (appsettings->value(NULL, GC_WHEELSIZE, 2100).toInt()/1000) * 60 / 1000);
else telemetry.setSpeed((x * devConf->wheelSize / 1000) * 60 / 1000); // not a global setting anymore -- device specific
}
/*======================================================================

4
src/TrainTool.cpp
View File

@@ -713,7 +713,7 @@ void TrainTool::Start() // when start button is pressed
load_msecs += load_period.restart();
#if defined Q_OS_MAC || defined GC_HAVE_VLC
// enable media tree so we can change movie
// enable media tree so we can change movie - mid workout
mediaTree->setEnabled(true);
#endif
@@ -874,7 +874,7 @@ void TrainTool::Stop(int deviceStatus) // when stop button is pressed
if ((status&RT_RUNNING) == 0) return;
status &= ~RT_RUNNING;
status &= ~(RT_RUNNING|RT_PAUSED);
// Stop users from selecting different devices
// media or workouts whilst a workout is in progress