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

fix:check scanPopup existence

Browse source
This commit is contained in:
xiaoyifang 2023-03-07 09:42:23 +08:00
parent 4f2c8d55aa
commit 84798c56ea
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mainwindow.cc
View file

@ -819,7 +819,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
applyQtStyleSheet( cfg.preferences.addonStyle, cfg.preferences.displayStyle, cfg.preferences.darkMode ); applyQtStyleSheet( cfg.preferences.addonStyle, cfg.preferences.displayStyle, cfg.preferences.darkMode );
// Scanpopup related // Scanpopup related
scanPopup = new ScanPopup(nullptr, cfg, articleNetMgr, audioPlayerFactory.player(), scanPopup = new ScanPopup(this, cfg, articleNetMgr, audioPlayerFactory.player(),
dictionaries, groupInstances, history ); dictionaries, groupInstances, history );
scanPopup->setStyleSheet(styleSheet()); scanPopup->setStyleSheet(styleSheet());
@ -937,6 +937,10 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
void MainWindow::clipboardChange( QClipboard::Mode m) void MainWindow::clipboardChange( QClipboard::Mode m)
{ {
if( !scanPopup )
{
return;
}
#if defined(HAVE_X11) #if defined(HAVE_X11)
if(m == QClipboard::Clipboard){ if(m == QClipboard::Clipboard){
@ -1154,8 +1158,8 @@ void MainWindow::commitData()
cfg.mainWindowGeometry = saveGeometry(); cfg.mainWindowGeometry = saveGeometry();
// Save popup window state and geometry // Save popup window state and geometry
if( scanPopup )
scanPopup->saveConfigData(); scanPopup->saveConfigData();
// Save any changes in last chosen groups etc // Save any changes in last chosen groups etc
try try

2
mainwindow.hh
View file

@ -154,7 +154,7 @@ private:
WordFinder wordFinder; WordFinder wordFinder;
ScanPopup * scanPopup; ScanPopup * scanPopup = nullptr;
sptr< HotkeyWrapper > hotkeyWrapper; sptr< HotkeyWrapper > hotkeyWrapper;