From 744d2aa2628e212fb8897bac937a3ec71a6195b1 Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sun, 22 Sep 2024 11:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=88https://gitee.com?=
=?UTF-8?q?/gfdgd-xi/deep-wine-runner/issues/IASRHG=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
VM/buildvbox.py | 2 +-
VM/mainwindow.py | 4 ++--
VM/qemu.py | 4 ++--
package-script/information.json | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VM/buildvbox.py b/VM/buildvbox.py
index a6f3b7f..86de8df 100755
--- a/VM/buildvbox.py
+++ b/VM/buildvbox.py
@@ -119,7 +119,7 @@ class buildvbox:
#vm.MountDisk(self.homePath() + "/Qemu/Windows/Windows.qcow2")
vm.MountMainDisk(self.homePath() + "/Qemu/Windows/Windows.qcow2")
- if(os.system("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso")):
+ if(os.path.exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso")):
vm.MountISO("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso", "storage_controller_2", 1, 3)
if(not setISOAlready):
vm.MountISO(isoPath, "storage_controller_1", 0, 1)
diff --git a/VM/mainwindow.py b/VM/mainwindow.py
index 6404cd5..af97c4b 100755
--- a/VM/mainwindow.py
+++ b/VM/mainwindow.py
@@ -148,7 +148,7 @@ def on_install_clicked():
QMessageBox.warning(this, ("提示"), ("VirtualBox 不支持该选项！"))
return
archFile.open(QIODevice.WriteOnly)
- archFile.write("aarch64")
+ #archFile.write("aarch64")
archFile.close()
else:
if(ui.vmChooser.currentIndex() == 0 and QFile.exists(QDir.homePath() + "/.config/deepin-wine-runner/QEMU-EFI")):
@@ -330,4 +330,4 @@ if (subprocess.getoutput("arch") != "x86_64"):
i.setVisible(False)
window.show()
if (__name__ == "__main__"):
- sys.exit(app.exec_())
\ No newline at end of file
+ sys.exit(app.exec_())
diff --git a/VM/qemu.py b/VM/qemu.py
index 0f8b8c9..354f024 100755
--- a/VM/qemu.py
+++ b/VM/qemu.py
@@ -24,8 +24,8 @@ class qemu:
self.qemuPath = "qemu-system-i386"
if (os.path.exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh")):
# 如果存在拓展 Qemu，则调用此
- qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-i386"
- self.vboxVersion = subprocess.getoutput(qemuPath + " --version")
+ self.qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-i386"
+ self.vboxVersion = subprocess.getoutput(self.qemuPath + " --version")
def Create(self, type = "Windows7"):
if(not os.path.exists(self.name)):
diff --git a/package-script/information.json b/package-script/information.json
index 5ef4478..bfedf35 100755
--- a/package-script/information.json
+++ b/package-script/information.json
@@ -1,5 +1,5 @@
{
- "Version": "4.1.0.0",
+ "Version": "4.1.0.1",
"Time": "未知",
"Thank": [
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",