Skip to content

Commit a7af45c

Browse files
main.js: Don't import NetworkAgent unless nm_agent support is enabled. (#13651)
When networkmanager is not present, imports.gi.NM will raise an exception and cause cinnamon to die.
1 parent d2e07c5 commit a7af45c

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

js/ui/main.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ const KeyringPrompt = imports.ui.keyringPrompt;
112112
const RunDialog = imports.ui.runDialog;
113113
const Layout = imports.ui.layout;
114114
const LookingGlass = imports.ui.lookingGlass;
115-
const NetworkAgent = imports.ui.networkAgent;
116115
const NotificationDaemon = imports.ui.notificationDaemon;
117116
const WindowAttentionHandler = imports.ui.windowAttentionHandler;
118117
const CinnamonDBus = imports.ui.cinnamonDBus;
@@ -450,7 +449,7 @@ function start() {
450449
// NM Agent
451450
if (Config.BUILT_NM_AGENT) {
452451
if (global.settings.get_boolean("enable-nm-agent")) {
453-
networkAgent = new NetworkAgent.NetworkAgent();
452+
networkAgent = new imports.ui.networkAgent.NetworkAgent();
454453
global.log('NetworkManager agent: enabled')
455454
} else {
456455
global.log('NetworkManager agent: disabled by settings')

0 commit comments

Comments
 (0)