Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-macos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-macos
Commits
8131541e
Commit
8131541e
authored
9 years ago
by
Edric Milaret
Browse files
Options
Downloads
Patches
Plain Diff
macosx: fix exit segfault
Refs #70803 Change-Id: I0471c01493e22ba97b8ad08df4caca7a3aaba223
parent
e3fe5396
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/AppDelegate.mm
+16
-1
16 additions, 1 deletion
src/AppDelegate.mm
with
16 additions
and
1 deletion
src/AppDelegate.mm
+
16
−
1
View file @
8131541e
...
...
@@ -30,7 +30,7 @@
#import "AppDelegate.h"
#import <callmodel.h>
#import <qapplication.h>
#import <accountmodel.h>
#import <protocolmodel.h>
#import <QItemSelectionModel>
...
...
@@ -54,6 +54,9 @@
[[
NSUserNotificationCenter
defaultUserNotificationCenter
]
setDelegate
:
self
];
NSAppleEventManager
*
appleEventManager
=
[
NSAppleEventManager
sharedAppleEventManager
];
[
appleEventManager
setEventHandler
:
self
andSelector
:
@selector
(
handleQuitEvent
:
withReplyEvent
:
)
forEventClass
:
kCoreEventClass
andEventID
:
kAEQuitApplication
];
if
([
self
checkForRingAccount
])
{
[
self
showMainWindow
];
}
else
{
...
...
@@ -133,4 +136,16 @@
return
YES
;
}
-
(
void
)
handleQuitEvent
:(
NSAppleEventDescriptor
*
)
event
withReplyEvent
:(
NSAppleEventDescriptor
*
)
replyEvent
{
delete
CallModel
::
instance
()
->
QObject
::
parent
();
[[
NSApplication
sharedApplication
]
terminate
:
self
];
}
-
(
void
)
applicationWillTerminate
:(
NSNotification
*
)
notification
{
delete
CallModel
::
instance
()
->
QObject
::
parent
();
[[
NSApplication
sharedApplication
]
terminate
:
self
];
}
@end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment