Skip to content

Commit

Permalink
Fix startup hang with recent webkit
Browse files Browse the repository at this point in the history
For some reason the chrome integration triggers with certain webkit
versions in the GTK (and maybe Qt) application.

The startup hangs at "Loading Resources" because a reference to "chrome"
cannot be resolved and triggers an uncaught exception locking up the
startup.

I wrapped the call to chrome in a try{} catch{} block to make it pass.
Shouldn't break any chrome integration but will get unchromy things to
startup properly.
  • Loading branch information
tante authored and kuromabo committed Apr 10, 2013
1 parent 2b20e97 commit 11c07b7
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions data/js/conf.js
Expand Up @@ -267,10 +267,14 @@ function apply_settings() {
$('.version').text(conf.vars.version
+ ' (' + conf.vars.codename + ')');
if (conf.vars.platform === 'Chrome') {
try {
chrome.extension.sendRequest(
{'enableContextMenu':conf.settings.context_menu_integration},
function (resp) {}
);
}
catch(err){
}
}
globals.twitterClient.oauth.key = localStorage.consumer_key || conf.vars.consumer_key;
globals.twitterClient.oauth.secret = localStorage.consumer_secret || conf.vars.consumer_secret;
Expand Down

0 comments on commit 11c07b7

Please sign in to comment.