mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
show outdated build dialog when expected version can't be used with current build
This commit is contained in:
parent
60ea9728f6
commit
8b94d746e5
1 changed files with 20 additions and 6 deletions
|
|
@ -10,19 +10,19 @@ from Qt import QtCore, QtGui, QtWidgets
|
|||
|
||||
import openpype.version
|
||||
from openpype.api import (
|
||||
Logger,
|
||||
resources,
|
||||
get_system_settings
|
||||
)
|
||||
from openpype.lib import (
|
||||
get_openpype_execute_args,
|
||||
from openpype.lib import get_openpype_execute_args, Logger
|
||||
from openpype.lib.openpype_version import (
|
||||
op_version_control_available,
|
||||
get_expected_version,
|
||||
get_installed_version,
|
||||
is_current_version_studio_latest,
|
||||
is_current_version_higher_than_expected,
|
||||
is_running_from_build,
|
||||
is_running_staging,
|
||||
get_expected_version,
|
||||
get_openpype_version
|
||||
get_openpype_version,
|
||||
)
|
||||
from openpype.modules import TrayModulesManager
|
||||
from openpype import style
|
||||
|
|
@ -329,6 +329,21 @@ class TrayManager:
|
|||
self._version_dialog.close()
|
||||
return
|
||||
|
||||
installed_version = get_installed_version()
|
||||
expected_version = get_expected_version()
|
||||
|
||||
# Request new build if is needed
|
||||
if not expected_version.is_compatible(installed_version):
|
||||
if (
|
||||
self._version_dialog is not None
|
||||
and self._version_dialog.isVisible()
|
||||
):
|
||||
self._version_dialog.close()
|
||||
|
||||
dialog = BuildVersionDialog()
|
||||
dialog.exec_()
|
||||
return
|
||||
|
||||
if self._version_dialog is None:
|
||||
self._version_dialog = VersionUpdateDialog()
|
||||
self._version_dialog.restart_requested.connect(
|
||||
|
|
@ -338,7 +353,6 @@ class TrayManager:
|
|||
self._outdated_version_ignored
|
||||
)
|
||||
|
||||
expected_version = get_expected_version()
|
||||
current_version = get_openpype_version()
|
||||
current_is_higher = is_current_version_higher_than_expected()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue