gui/scan_setup:fix override gotoXXLongitude & gotoXXLatitude with uninitialized zapit_lat or zapit_long

Origin commit data
------------------
Commit: 5e60b64469
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)
This commit is contained in:
Jacek Jendrzej
2013-09-01 14:35:35 +02:00
parent 28dc18f515
commit 34c0584199
2 changed files with 6 additions and 4 deletions

View File

@@ -1389,7 +1389,9 @@ void CScanSetup::saveScanSetup()
dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n"); dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n");
//CServiceManager::getInstance()->SaveMotorPositions(); //CServiceManager::getInstance()->SaveMotorPositions();
if(zapit_lat[0] != '#')//check if var ok
zapitCfg.gotoXXLatitude = strtod(zapit_lat, NULL); zapitCfg.gotoXXLatitude = strtod(zapit_lat, NULL);
if(zapit_long[0] != '#')//check if var ok
zapitCfg.gotoXXLongitude = strtod(zapit_long, NULL); zapitCfg.gotoXXLongitude = strtod(zapit_long, NULL);
CZapit::getInstance()->SetConfig(&zapitCfg); CZapit::getInstance()->SetConfig(&zapitCfg);

View File

@@ -128,8 +128,8 @@ bool has_hdd;
CInfoClock *InfoClock; CInfoClock *InfoClock;
int allow_flash = 1; int allow_flash = 1;
Zapit_config zapitCfg; Zapit_config zapitCfg;
char zapit_lat[20]; char zapit_lat[20]="#";
char zapit_long[20]; char zapit_long[20]="#";
bool autoshift = false; bool autoshift = false;
uint32_t scrambled_timer; uint32_t scrambled_timer;
t_channel_id standby_channel_id; t_channel_id standby_channel_id;