morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Only try to disable ubuntu-dock if its state is enabled

Browse Source
This commit is contained in:
Charles Gagnon
2024-05-03 12:14:30 -04:00
parent 1759c2c804
commit bbb85f6565
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extension.js
View File

@@ -104,16 +104,17 @@ export default class DashToPanelExtension extends Extension {
function _enable(extension) {
let ubuntuDock = extensionSystem.lookup(UBUNTU_DOCK_UUID);
if (ubuntuDock && ubuntuDock.stateObj) {
if (ubuntuDock && ubuntuDock.stateObj && ubuntuDock.state == 1) { //ExtensionState.ACTIVE
// Disable Ubuntu Dock
let extensionOrder = (extensionSystem.extensionOrder || extensionSystem._extensionOrder);
let extensionOrder = extensionSystem._extensionOrder;
Utils.getStageTheme().get_theme().unload_stylesheet(ubuntuDock.stylesheet);
ubuntuDock.stateObj.disable();
disabledUbuntuDock = true;
ubuntuDock.state = 2; //ExtensionState.DISABLED
extensionSystem._unloadExtensionStylesheet(ubuntuDock);
ubuntuDock.state = 2; //ExtensionState.INACTIVE
extensionOrder.splice(extensionOrder.indexOf(UBUNTU_DOCK_UUID), 1);
disabledUbuntuDock = true;
//reset to prevent conflicts with the ubuntu-dock
if (panelManager) {
extension.disable(true);
@@ -140,4 +141,4 @@ function _enable(extension) {
panelManager = new PanelManager.PanelManager();
panelManager.enable();
}
}