Revision: 6712
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6712&view=rev
Author:   hofman
Date:     2010-08-18 14:10:42 +0000 (Wed, 18 Aug 2010)

Log Message:
-----------
reset last viewed pages before going to initial page

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-08-18 13:49:00 UTC (rev 6711)
+++ trunk/SKMainWindowController.m      2010-08-18 14:10:42 UTC (rev 6712)
@@ -436,8 +436,10 @@
         pageIndex = [[savedNormalSetup objectForKey:PAGEINDEX_KEY] 
unsignedIntegerValue];
     else if ([sud boolForKey:SKRememberLastPageViewedKey])
         pageIndex = [[SKBookmarkController sharedBookmarkController] 
pageIndexForRecentDocumentAtPath:[[[self document] fileURL] path]];
-    if (pageIndex != NSNotFound && [[pdfView document] pageCount] > pageIndex)
+    if (pageIndex != NSNotFound && [[pdfView document] pageCount] > pageIndex 
&& [[pdfView currentPage] pageIndex] != pageIndex) {
+        [lastViewedPages removeAllObjects];
         [pdfView goToPage:[[pdfView document] pageAtIndex:pageIndex]];
+    }
     
     // We can fit only after the PDF has been loaded
     if (windowSizeOption == SKFitWindowOption && hasWindowSetup == NO)
@@ -518,8 +520,10 @@
         
         NSNumber *pageIndexNumber = [setup objectForKey:PAGEINDEX_KEY];
         NSUInteger pageIndex = [pageIndexNumber unsignedIntegerValue];
-        if (pageIndexNumber && pageIndex != NSNotFound)
+        if (pageIndexNumber && pageIndex != NSNotFound && pageIndex != 
[[pdfView currentPage] pageIndex]) {
+            [lastViewedPages removeAllObjects];
             [pdfView goToPage:[[pdfView document] pageAtIndex:pageIndex]];
+        }
         
         NSArray *snapshotSetups = [setup objectForKey:SNAPSHOTS_KEY];
         if ([snapshotSetups count])


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to