Skip to content

Commit 45cc66f

Browse files
authored
Merge pull request #28 from coryleach/dev
NRE Fix on Exit
2 parents 2eca72d + 76d5653 commit 45cc66f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ Includes a SRP shader for blurring the background of UI panels.
2222
#### Using UnityPackageManager (for Unity 2019.3 or later)
2323
Open the package manager window (menu: Window > Package Manager)<br/>
2424
Select "Add package from git URL...", fill in the pop-up with the following link:<br/>
25-
https://github.com/coryleach/UnityGUI.git#3.0.11<br/>
25+
https://github.com/coryleach/UnityGUI.git#3.0.12<br/>
2626

2727
#### Using UnityPackageManager (for Unity 2019.1 or later)
2828

2929
Find the manifest.json file in the Packages folder of your project and edit it to look like this:
3030
```js
3131
{
3232
"dependencies": {
33-
"com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.11",
33+
"com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#3.0.12",
3434
...
3535
},
3636
}

Runtime/Tween/TweenExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static class TweenExtensions
1313

1414
private static CancellationToken CancellationToken => (_cancellationTokenSource != null) ? _cancellationTokenSource.Token : CancellationToken.None;
1515

16-
private static bool CanTween => CanTweenPredicate.Invoke();
16+
private static bool CanTween => CanTweenPredicate.Invoke() && _tweenDict != null;
1717

1818
private static Func<bool> _canTweenPredicate = DefaultCanTweenPredicate;
1919
public static Func<bool> CanTweenPredicate

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "com.gameframe.gui",
33
"displayName": "Gameframe.GUI",
4-
"version": "3.0.11",
4+
"version": "3.0.12",
55
"description": "This is a library of GUI helpers for UGUI \r\nIncludes a panel system that implements a navigation stack. \r\nIncludes a scene transition system. \r\nIncludes a SRP shader for blurring the background of UI panels.",
66
"keywords": [],
77
"author": {

0 commit comments

Comments
 (0)