diff --git a/app/scanner/device_menu.cpp b/app/scanner/device_menu.cpp index e9271210..2db8103c 100644 --- a/app/scanner/device_menu.cpp +++ b/app/scanner/device_menu.cpp @@ -142,7 +142,7 @@ void device_menu::update(const std::vector* dev_cfgs) child = group_action_->addAction(QString::fromStdString((*dev_cfgs)[i].schemes[j].m_schemeName)); child->setProperty(ACTION_DEVICE_NAME_PROPERTY, pm.menu->title()); child->setCheckable(true); - child->setChecked(true); + child->setChecked(false); pm.menu->addAction(child); pm.actions.push_back(child); diff --git a/app/scanner/hg_settingdialog.cpp b/app/scanner/hg_settingdialog.cpp index b2f217e1..d5b84f39 100644 --- a/app/scanner/hg_settingdialog.cpp +++ b/app/scanner/hg_settingdialog.cpp @@ -1877,10 +1877,14 @@ void hg_settingdialog::save_scheme(void) if (!os.m_schemeTitle.empty()) { - while (std::find(schemes_->schemes.begin(), schemes_->schemes.end(), os.m_schemeTitle + buf) - != schemes_->schemes.end()) + std::string tb= os.m_schemeTitle + buf; + for(int m = 0; m < schemes_->schemes.size(); ++m) { - sprintf(buf, "-%d", ind++); + if(strcmp(tb.c_str(), schemes_->schemes[m].m_schemeTitle.c_str()) == 0) + { + sprintf(buf, "-%d", ind++); + break; + } } os.m_schemeTitle += buf; }