summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt3
-rw-r--r--panes/toolbar.html22
2 files changed, 18 insertions, 7 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2e26267..1293694 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,6 +7,9 @@ Fixed error when creating host-only networks
Fixed host-only network DHCP server settings
+Fix USB device attaching / detaching from Settings menu of a
+running VM.
+
-------------------------------------
5.0-1 2015-08-05
-------------------------------------
diff --git a/panes/toolbar.html b/panes/toolbar.html
index 99f2839..b637c60 100644
--- a/panes/toolbar.html
+++ b/panes/toolbar.html
@@ -134,13 +134,13 @@ vboxChooserToolbarTop.getButtonElement('settings').contextMenu({
if(!vm) return;
- if(a == 'Network' || a == 'SharedFolders') {
- vboxVMsettingsDialog(vm, a);
- return;
- }
-
switch(a) {
+ case 'Network':
+ case 'SharedFolders':
+ vboxVMsettingsDialog(vm, a);
+ break;
+
case 'GuestAdditions':
vboxVMActions['guestAdditionsInstall'].click();
@@ -316,9 +316,17 @@ function vboxUpdateSettingsMenu(vm) {
vboxChooserToolbarTop.getButtonElement("settings").disableContextMenu();
return;
}
-
// enable or disable USB
- if(vm && vm['USBController'] && vm['USBController']['enabled']) {
+ var usbEnabled = false;
+ if(vm['USBControllers'].length) {
+ for(var i = 0; i < vm['USBControllers'].length; i++) {
+ if(vm['USBControllers'][i].type == 'OHCI') {
+ usbEnabled = true;
+ break;
+ }
+ }
+ }
+ if(usbEnabled) {
$('ul.vboxSettingsUSBAttachmentsMenu').children().remove();
$('#vboxVMSettingsMenu').find('a[href=#USB]').closest('li').css('display','');
} else {