[Skim-app-commit] SF.net SVN: skim-app:[14020] trunk

[hofman--- via Skim-app-commit]

Revision: 14020
          http://sourceforge.net/p/skim-app/code/14020
Author:   hofman
Date:     2024-01-26 10:22:57 +0000 (Fri, 26 Jan 2024)
Log Message:
-----------
Don't check old value when setting weak property to nil, it may already be set 
to nil from being weak

Modified Paths:
--------------
    trunk/SKFindController.m
    trunk/SKLeftSideViewController.m
    trunk/SKMainToolbarController.m
    trunk/SKMainTouchBarController.m
    trunk/SKPDFView.m
    trunk/SKRightSideViewController.m

Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m    2024-01-26 10:12:18 UTC (rev 14019)
+++ trunk/SKFindController.m    2024-01-26 10:22:57 UTC (rev 14020)
@@ -103,7 +103,7 @@
 }
 
 - (void)setDelegate:(id <SKFindControllerDelegate>)newDelegate {
-    if (delegate && newDelegate == nil)
+    if (newDelegate == nil)
         [ownerController setContent:nil];
     delegate = newDelegate;
 }

Modified: trunk/SKLeftSideViewController.m
===================================================================
--- trunk/SKLeftSideViewController.m    2024-01-26 10:12:18 UTC (rev 14019)
+++ trunk/SKLeftSideViewController.m    2024-01-26 10:22:57 UTC (rev 14020)
@@ -148,7 +148,7 @@
 }
 
 - (void)setMainController:(SKMainWindowController *)newMainController {
-    if (mainController && newMainController == nil) {
+    if (newMainController == nil) {
         [thumbnailTableView setDelegate:nil];
         [thumbnailTableView setDataSource:nil];
         [findTableView setDelegate:nil];

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2024-01-26 10:12:18 UTC (rev 14019)
+++ trunk/SKMainToolbarController.m     2024-01-26 10:22:57 UTC (rev 14020)
@@ -141,7 +141,7 @@
 }
 
 - (void)setMainController:(SKMainWindowController *)newMainController {
-    if (mainController != nil && newMainController == nil) {
+    if (newMainController == nil) {
         [colorSwatch unbind:@"colors"];
         [[NSNotificationCenter defaultCenter] removeObserver: self];
     }

Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m    2024-01-26 10:12:18 UTC (rev 14019)
+++ trunk/SKMainTouchBarController.m    2024-01-26 10:22:57 UTC (rev 14020)
@@ -90,16 +90,14 @@
 @synthesize mainController;
 
 - (void)setMainController:(SKMainWindowController *)newMainController {
-    if (newMainController != mainController) {
-        if (mainController) {
-            [[NSNotificationCenter defaultCenter] removeObserver:self];
-            if (newMainController == nil)
-                [colorPicker setDelegate:nil];
-        }
-        mainController = newMainController;
-        if (mainController)
-            [self registerForNotifications];
+    if (mainController) {
+        [[NSNotificationCenter defaultCenter] removeObserver:self];
+        if (newMainController == nil)
+            [colorPicker setDelegate:nil];
     }
+    mainController = newMainController;
+    if (mainController)
+        [self registerForNotifications];
 }
 
 - (NSTouchBar *)makeTouchBar {

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2024-01-26 10:12:18 UTC (rev 14019)
+++ trunk/SKPDFView.m   2024-01-26 10:22:57 UTC (rev 14020)
@@ -5344,7 +5344,7 @@
 }
 
 - (void)setDelegate:(id <SKPDFViewDelegate>)newDelegate {
-    if ([self delegate] && newDelegate == nil)
+    if (newDelegate == nil)
         [self cleanup];
     [super setDelegate:newDelegate];
 }

Modified: trunk/SKRightSideViewController.m
===================================================================
--- trunk/SKRightSideViewController.m   2024-01-26 10:12:18 UTC (rev 14019)
+++ trunk/SKRightSideViewController.m   2024-01-26 10:22:57 UTC (rev 14020)
@@ -118,7 +118,7 @@
 }
 
 - (void)setMainController:(SKMainWindowController *)newMainController {
-    if (mainController && newMainController == nil) {
+    if (newMainController == nil) {
         [snapshotTableView setDelegate:nil];
         [snapshotTableView setDataSource:nil];
         [noteOutlineView setDelegate:nil];

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit