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:epwing navigation reference to invalid position

Browse source
This commit is contained in:
xiaoyifang 2023-05-04 20:29:33 +08:00
parent 209b5e79da
commit bbec4685f8
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dict/epwing.cc
View file

@ -361,9 +361,7 @@ void EpwingDictionary::loadArticleNextPage(string & articleHeadword, string & ar
} }
catch( std::exception & e ) catch( std::exception & e )
{ {
text = QString( "Article reading error: %1") qWarning() << QString( "Article reading error: %1" ).arg( QString::fromUtf8( e.what() ) );
.arg( QString::fromUtf8( e.what() ) );
articleText = string( text.toUtf8().data() );
return; return;
} }
@ -399,8 +397,7 @@ void EpwingDictionary::loadArticlePreviousPage(
pos = eBook.getArticlePreviousPage( headword, text, articlePage, articleOffset, false ); pos = eBook.getArticlePreviousPage( headword, text, articlePage, articleOffset, false );
} }
catch( std::exception & e ) { catch( std::exception & e ) {
text = QString( "Article reading error: %1" ).arg( QString::fromUtf8( e.what() ) ); qDebug() << QString( "Article reading error: %1" ).arg( QString::fromUtf8( e.what() ) );
articleText = string( text.toUtf8().data() );
return; return;
} }
@ -778,6 +775,15 @@ void EpwingArticleRequest::run()
dict.loadArticlePreviousPage( headword, articleText, articlePage, articleOffset ); dict.loadArticlePreviousPage( headword, articleText, articlePage, articleOffset );
} }
//the reference may not contain valid text. at this point ,should return directly.
if ( articleText.empty() ) {
//clear result.
result.clear();
// No such word
finish();
return;
}
result += articleText; result += articleText;
} }

2
thirdparty/eb vendored

@ -1 +1 @@
Subproject commit ec8904dc8b390b746573492806790cd11b164927 Subproject commit f45db88f160a9e597c3e050d37c011934fa5e773