summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-07-16 23:46:36 (UTC)
committer llornkcor <llornkcor>2002-07-16 23:46:36 (UTC)
commit238f77dac6c82b420e2e6334fabf9b7744abd844 (patch) (unidiff)
tree23771c76cb5ffa8da248ae4977ec13e36c5cb62f
parent6d5261a534612f0f993caca801e7c7e1a5c74f32 (diff)
downloadopie-238f77dac6c82b420e2e6334fabf9b7744abd844.zip
opie-238f77dac6c82b420e2e6334fabf9b7744abd844.tar.gz
opie-238f77dac6c82b420e2e6334fabf9b7744abd844.tar.bz2
fix for initial start crash when there's no config file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/QTReader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index fc9cffb..6335ea2 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -652,48 +652,49 @@ int main( int argc, tchar **argv )
652 return app.exec(); 652 return app.exec();
653} 653}
654*/ 654*/
655 655
656 656
657bool QTReader::locate(unsigned long n) { 657bool QTReader::locate(unsigned long n) {
658 //printf("Locate\n"); 658 //printf("Locate\n");
659 buffdoc.locate(n); 659 buffdoc.locate(n);
660 // qDebug("&buffdoc.located"); 660 // qDebug("&buffdoc.located");
661 fillbuffer(); 661 fillbuffer();
662 // qDebug("&Buffer filled"); 662 // qDebug("&Buffer filled");
663 update(); 663 update();
664 // qDebug("&Located"); 664 // qDebug("&Located");
665 return true; 665 return true;
666} 666}
667 667
668unsigned int QTReader::screenlines() 668unsigned int QTReader::screenlines()
669{ 669{
670 // int linespacing = (tight) ? m_ascent : m_ascent+m_descent; 670 // int linespacing = (tight) ? m_ascent : m_ascent+m_descent;
671 // return (height()-m_descent)/(m_linespacing); 671 // return (height()-m_descent)/(m_linespacing);
672 return (height()-2)/(m_linespacing); 672 return (height()-2)/(m_linespacing);
673}; 673};
674 674
675bool QTReader::fillbuffer() { 675bool QTReader::fillbuffer() {
676 if (buffdoc.empty()) return false;
676 //printf("Fillbuffer\n"); 677 //printf("Fillbuffer\n");
677 m_scrolldy = 0; 678 m_scrolldy = 0;
678 int ch; 679 int ch;
679 bool ret = false; 680 bool ret = false;
680 int delta = screenlines(); 681 int delta = screenlines();
681 // qDebug("fillbuffer:%u-%u",delta,numlines); 682 // qDebug("fillbuffer:%u-%u",delta,numlines);
682 if (delta != numlines) 683 if (delta != numlines)
683 { 684 {
684 if (textarray != NULL) 685 if (textarray != NULL)
685 { 686 {
686 for (int i = 0; i < numlines; i++) delete textarray[i]; 687 for (int i = 0; i < numlines; i++) delete textarray[i];
687 delete [] textarray; 688 delete [] textarray;
688 delete [] locnarray; 689 delete [] locnarray;
689 } 690 }
690 numlines = delta; 691 numlines = delta;
691 textarray = new CBuffer*[numlines]; 692 textarray = new CBuffer*[numlines];
692 locnarray = new size_t[numlines]; 693 locnarray = new size_t[numlines];
693 for (int i = 0; i < numlines; i++) textarray[i] = new CBuffer; 694 for (int i = 0; i < numlines; i++) textarray[i] = new CBuffer;
694 } 695 }
695 // qDebug("fillbuffer:pagepos:%u",pagepos); 696 // qDebug("fillbuffer:pagepos:%u",pagepos);
696 unsigned int oldpagepos = pagepos; 697 unsigned int oldpagepos = pagepos;
697// if (textarray != NULL) 698// if (textarray != NULL)
698// pagepos = locnarray[0]; 699// pagepos = locnarray[0];
699// else 700// else