From e1e15787c543f9769d0fafa5e8caec829773ed40 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sun, 6 Apr 2014 10:55:56 +0200
Subject: [PATCH] Missing initialization in simulator. Does if fix #937?

---
 companion/src/simulation/simulatordialog.cpp | 6 ++++--
 radio/src/simpgmspace.cpp                    | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index 16d3a8b07..0f805e979 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -336,8 +336,6 @@ void SimulatorDialog::initUi(T * ui)
   else {
     ui->lcd->setFocus();
   }
-
-  setupTimer();
 }
 
 void SimulatorDialog::onButtonPressed(int value)
@@ -437,11 +435,15 @@ void SimulatorDialog::centerSticks()
 void SimulatorDialog::start(QByteArray & eeprom)
 {
   simulator->start(eeprom, (flags & SIMULATOR_FLAGS_NOTX) ? false : true);
+  getValues();
+  setupTimer();
 }
 
 void SimulatorDialog::start(const char * filename)
 {
   simulator->start(filename);
+  getValues();
+  setupTimer();
 }
 
 void SimulatorDialog::setTrims()
diff --git a/radio/src/simpgmspace.cpp b/radio/src/simpgmspace.cpp
index 305d00b61..b2532ab12 100644
--- a/radio/src/simpgmspace.cpp
+++ b/radio/src/simpgmspace.cpp
@@ -350,6 +350,8 @@ void StartMainThread(bool tests)
   pthread_mutex_init(&audioMutex, NULL);
 #endif
 
+  g_tmr10ms = 0;
+
   main_thread_running = (tests ? 1 : 2);
   pthread_create(&main_thread_pid, NULL, &main_thread, NULL);
 }