# HG changeset patch # User Wuzzy # Date 1507739959 -7200 # Node ID 5b135c26f320debd5b1e8d1660df26a90fdee0e4 # Parent e095ed0026520cc26b5da0504007c9ce2865b3c3 Don't let player save ammo scheme with pre-installed name, even case-insensitively diff -r e095ed002652 -r 5b135c26f320 QTfrontend/ui/widget/selectWeapon.cpp --- a/QTfrontend/ui/widget/selectWeapon.cpp Wed Oct 11 01:23:38 2017 +0200 +++ b/QTfrontend/ui/widget/selectWeapon.cpp Wed Oct 11 18:39:19 2017 +0200 @@ -226,12 +226,15 @@ for(int i = 0; i < cDefaultAmmos.size(); i++) { - if (cDefaultAmmos[i].first.compare(m_name->text()) == 0) + // Don't allow same name as default weapon set, even case-insensitively. + // This prevents some problems with saving/loading. + if (cDefaultAmmos[i].first.toLower().compare(m_name->text().toLower()) == 0) { // don't show warning if no change if (cDefaultAmmos[i].second.compare(stateFull) == 0) return; + m_name->setText(curWeaponsName); QMessageBox deniedMsg(this); deniedMsg.setIcon(QMessageBox::Warning); deniedMsg.setWindowTitle(QMessageBox::tr("Weapons - Warning"));