hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge pull request #1357 from xiaoyifang/fix/dictionary-crash

Browse source 
fix: validate the dictionary when push it into the variable
This commit is contained in:
xiaoyifang 2024-01-04 20:39:41 +08:00 committed by GitHub
parent cbcd274ac1 c2a6b9b7d9
commit 730a4b24cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/instances.cc
View file

@ -45,7 +45,9 @@ Group::Group( Config::Group const & cfgGroup,
} }
} }
for ( const auto & dictId : dictOrderList ) { for ( const auto & dictId : dictOrderList ) {
dictionaries.push_back( groupDicts[ dictId ] ); if ( groupDicts.contains( dictId ) ) {
dictionaries.push_back( groupDicts[ dictId ] );
}
} }
} }

4
src/ui/mainwindow.cc
View file

@ -1652,8 +1652,8 @@ void MainWindow::updateDictionaryBar()
if ( currentId == Instances::Group::AllGroupId ) if ( currentId == Instances::Group::AllGroupId )
dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries ); dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
else { else {
Config::Group * grp = cfg.getGroup( currentId ); Config::Group * _grp = cfg.getGroup( currentId );
dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : nullptr ); dictionaryBar.setMutedDictionaries( _grp ? &_grp->mutedDictionaries : nullptr );
} }
dictionaryBar.setDictionaries( grp->dictionaries ); dictionaryBar.setDictionaries( grp->dictionaries );