Revision: 16115
          http://sourceforge.net/p/skim-app/code/16115
Author:   hofman
Date:     2026-03-26 23:09:53 +0000 (Thu, 26 Mar 2026)
Log Message:
-----------
Don't remove cropboxes when reloading unlocked document. Do remove cropboxes 
wwhen we set it to avoid setting it twice

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2026-03-26 16:53:54 UTC (rev 16114)
+++ trunk/SKMainWindowController.m      2026-03-26 23:09:53 UTC (rev 16115)
@@ -1175,17 +1175,17 @@
         
         [oldPdfDoc setContainingDocument:nil];
         
-        if ([oldPdfDoc isLocked]) {
-            [savedNormalSetup removeObjectForKey:CROPBOXES_KEY];
-            if (unlocked)
+        if (unlocked == [oldPdfDoc isLocked]) {
+            if (unlocked) {
                 [self performSelector:@selector(documentDidUnlockDelayed) 
withObject:nil afterDelay:0.0];
-        } else if (unlocked == NO) {
-            if ([self interactionMode] == SKNormalMode)
-                 [savedNormalSetup setDictionary:[pdfView displaySettings]];
-             [savedNormalSetup setObject:@YES forKey:LOCKED_KEY];
-             setDestinationInSetup(dest, savedNormalSetup);
-             if ([snapshotDicts count])
-                 [savedNormalSetup setObject:snapshotDicts 
forKey:SNAPSHOTS_KEY];
+            } else {
+                if ([self interactionMode] == SKNormalMode)
+                     [savedNormalSetup setDictionary:[pdfView 
displaySettings]];
+                 [savedNormalSetup setObject:@YES forKey:LOCKED_KEY];
+                 setDestinationInSetup(dest, savedNormalSetup);
+                 if ([snapshotDicts count])
+                     [savedNormalSetup setObject:snapshotDicts 
forKey:SNAPSHOTS_KEY];
+            }
         }
     }
     
@@ -1195,6 +1195,7 @@
             [pdfDocument setChangedCropBoxes:cropBoxes];
             mwcFlags.hasCropped = 1;
         }
+        [savedNormalSetup removeObjectForKey:CROPBOXES_KEY];
     }
     
     if ([noteDicts count]) {

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



_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to