From f62d6b65881f778ba0bc55abf663f6de145ab105 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期三, 15 八月 2018 10:29:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 7101575..4908f59 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -64,9 +64,10 @@
protected override void OnActived()
{
- if (functionOrder == 1)
+ if (alreadyOpenActivitys.Count == 0)
{
- functionOrder = 0;
+ CloseImmediately();
+ return;
}
if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState)
{
@@ -79,6 +80,10 @@
}
else
{
+ if (!alreadyOpenActivitys.Contains(functionOrder))
+ {
+ functionOrder = GetDefaultSelect();
+ }
for (int i = 0; i < m_SortArray.Count; i++)
{
m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder;
--
Gitblit v1.8.0