aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPWindowControllerDelegate.m
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2017-05-16 00:29:21 +0200
committerMax <post@wickenrode.com>2017-05-16 00:29:21 +0200
commit8fcdb7bcc6dedb7af9b1a7829a83cdc2fca54f4b (patch)
tree6b550386c3b2c9e2d8b2f5627beb6b03b30609fa /Source/SPWindowControllerDelegate.m
parentb50d4e9a6f55c26d3fbe33b33d78063ad1e9e9fd (diff)
downloadsequelpro-8fcdb7bcc6dedb7af9b1a7829a83cdc2fca54f4b.tar.gz
sequelpro-8fcdb7bcc6dedb7af9b1a7829a83cdc2fca54f4b.tar.bz2
sequelpro-8fcdb7bcc6dedb7af9b1a7829a83cdc2fca54f4b.zip
Fix an erroneous check that would allow to close windows with only one tab even when it was busy (#2787)
Diffstat (limited to 'Source/SPWindowControllerDelegate.m')
-rw-r--r--Source/SPWindowControllerDelegate.m16
1 files changed, 7 insertions, 9 deletions
diff --git a/Source/SPWindowControllerDelegate.m b/Source/SPWindowControllerDelegate.m
index 79b1e2f1..009dc0a4 100644
--- a/Source/SPWindowControllerDelegate.m
+++ b/Source/SPWindowControllerDelegate.m
@@ -56,15 +56,11 @@
*/
- (BOOL)windowShouldClose:(id)sender
{
- // Iterate through all tabs if more than one tab is opened only otherwise
- // [... parentTabShouldClose] will be called twice [see self closeTab:(id)sender]
- if ([[tabView tabViewItems] count] > 1) {
- for (NSTabViewItem *eachItem in [tabView tabViewItems])
- {
- SPDatabaseDocument *eachDocument = [eachItem identifier];
-
- if (![eachDocument parentTabShouldClose]) return NO;
- }
+ for (NSTabViewItem *eachItem in [tabView tabViewItems])
+ {
+ SPDatabaseDocument *eachDocument = [eachItem identifier];
+
+ if (![eachDocument parentTabShouldClose]) return NO;
}
// Remove global session data if the last window of a session will be closed
@@ -190,6 +186,8 @@
/**
* Called to determine whether a tab view item can be closed
+ *
+ * Note: This is ONLY called when using the "X" button on the tab itself.
*/
- (BOOL)tabView:(NSTabView *)aTabView shouldCloseTabViewItem:(NSTabViewItem *)tabViewItem
{