Merge branch 'release/6_21' into 'develop'

Release/6 21

See merge request BPHV_MIPS/mvm_core!38
This commit is contained in:
Pan, Xinlei (Ryan) 2019-10-21 15:34:00 -04:00
commit ad1de4b4f3

View File

@ -63,14 +63,14 @@
if (self.loadingViewController) {
self.loadCount++;
// Notify we are beginning the laod
if ([[MVMCoreObject sharedInstance].loadingProtocol respondsToSelector:@selector(beginningLoading)]) {
[[MVMCoreObject sharedInstance].loadingProtocol beginningLoading];
}
// If we are already waiting to animate or animating in, do nothing.
if (!self.animationTimer && !self.animatingIn) {
// Notify we are beginning the laod
if ([[MVMCoreObject sharedInstance].loadingProtocol respondsToSelector:@selector(beginningLoading)]) {
[[MVMCoreObject sharedInstance].loadingProtocol beginningLoading];
}
// Restarts the loading animation.
[self.loadingViewController startLoading];