Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Quicksilver/Code-QuickStepCore/QSLibrarian.m
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ - (QSObject *)objectWithIdentifier:(NSString *)ident

- (void)setIdentifier:(NSString *)ident forObject:(QSObject *)obj
{
if (ident) {
if (ident && obj) {
[self.objectDictionary setObject:obj forKey:ident];
}
}
Expand Down
12 changes: 10 additions & 2 deletions Quicksilver/Code-QuickStepCore/QSObject_Pasteboard.m
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,17 @@ - (void)guessName {
NSString *textString = [data objectForKey:QSTextType];
// some objects (images from the web) don't have a text string but have a URL
if (!textString) {
textString = [data objectForKey:NSPasteboardTypeURL];
id urlObject = [data objectForKey:NSPasteboardTypeURL];
// Handle case where URL might be NSData instead of NSString
if ([urlObject isKindOfClass:[NSData class]]) {
textString = [[NSString alloc] initWithData:urlObject encoding:NSUTF8StringEncoding];
} else if ([urlObject isKindOfClass:[NSString class]]) {
textString = urlObject;
}
}
if ([textString isKindOfClass:[NSString class]]) {
textString = [textString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
}
textString = [textString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];

static NSArray *namesAndKeys = nil;

Expand Down
2 changes: 1 addition & 1 deletion Quicksilver/Code-QuickStepCore/QSPaths.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// URL to crash reporter server/script
#define kCrashReporterURL @"https://qs0.qsapp.com/crashreports/reporter.php"
// Wiki page detailing why we collect crash reports
#define kCrashReportsWikiURL @"https://qsapp.com/wiki/Crash_Reports"
#define kCrashReportsWikiURL @"https://docs.qsapp.com/documentation/supporting-quicksilver/crash_reports"

/**
* Get the path to a subdirectory in the Quicksilver 'Application Support' directory
Expand Down
3 changes: 2 additions & 1 deletion Quicksilver/Code-QuickStepCore/QSProcessMonitor.m
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,8 @@ - (void)appLaunched:(ProcessSerialNumber)psn {
QSObject *procObject = [self imbuedFileProcessForDict:dict];
QSGCDMainAsync(^{
// This notif is used for the Events plugin 'Application Launched' event trigger
[[NSNotificationCenter defaultCenter] postNotificationName:@"QSEventNotification" object:@"QSApplicationLaunchEvent" userInfo:[NSDictionary dictionaryWithObject:procObject forKey:@"object"]];
NSDictionary *userInfo = procObject ? [NSDictionary dictionaryWithObject:procObject forKey:@"object"] : nil;
[[NSNotificationCenter defaultCenter] postNotificationName:@"QSEventNotification" object:@"QSApplicationLaunchEvent" userInfo:userInfo];
[[NSNotificationCenter defaultCenter] postNotificationName:QSProcessMonitorApplicationLaunched object:self userInfo:dict];
});
}
Expand Down
16 changes: 16 additions & 0 deletions Quicksilver/Resources/CrashReporterText.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<style>
:root {
color-scheme: light dark;
}
div {
color: #000000;
}
@media (prefers-color-scheme: dark) {
div {
color: #ffffff;
}
a {
color: #5ab2ff !important;
}
}
</style>
<div style="font-family:'Lucida Grande';font-size:12px;text-align:justify;padding:0px;margin:0px">
<p>In order to help improve Quicksilver, please consider sending a crash report to the developers. Quicksilver will restart when this window closes.</p>
<p>To troubleshoot your problem, see the <a href="https://qsapp.com/manual/FAQ/" style="text-decoration:underline;color:blue">FAQ</a> or alternatively report your issue on the <a href="https://github.com/quicksilver/Quicksilver/issues" style="text-decoration:underline;color:blue">issue tracker</a>.</p>
Expand Down
16 changes: 16 additions & 0 deletions Quicksilver/Resources/PluginReporterText.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<style>
:root {
color-scheme: light dark;
}
div {
color: #000000;
}
@media (prefers-color-scheme: dark) {
div {
color: #ffffff;
}
a {
color: #5ab2ff !important;
}
}
</style>
<div style="font-family:'Lucida Grande';font-size:12px;text-align:justify;padding:0px;margin:0px">
<p>The *** plugin caused Quicksilver to crash, you may wish to delete it.
In order to help improve Quicksilver, please consider sending a crash report to the developers. Quicksilver will restart when this window closes.</p>
Expand Down