Skip to content

fix crash on app load fail #2265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madanagopalt wants to merge 17 commits into
base: _jsc
Choose a base branch
from
Open

fix crash on app load fail #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6b76fa2
fix crash on app load fail
madanagopaltcomcast Apr 14, 2020
41556a5
Update rtScriptNode.cpp
madanagopalt Apr 14, 2020
070d095
fix crash on app load fail
madanagopaltcomcast Apr 14, 2020
2071092
Merge branch 'ii' of https://github.com/madanagopalt/pxCore into ii
madanagopaltcomcast Apr 14, 2020
f3f7d34
Review
madanagopalt Apr 14, 2020
afe62f5
Update pxScene2d.cpp
madanagopalt Apr 14, 2020
697bd57
Update rtPromise.h
madanagopalt Apr 14, 2020
b540e34
Update rtPromise.h
madanagopalt Apr 14, 2020
6da4bcb
Merge pull request #3 from madanagopalt/madanagopalt-patch-1
madanagopalt Apr 14, 2020
5254b8e
Merge pull request #3 from madanagopalt/madanagopalt-patch-1
madanagopalt Apr 14, 2020
18eaa2c
Merge branch 'ii' of https://github.com/madanagopalt/pxCore into ii
madanagopaltcomcast Apr 14, 2020
7182315
Merge branch 'ii' of https://github.com/madanagopalt/pxCore into ii
madanagopaltcomcast Apr 14, 2020
5ea452f
Merge branch 'ii' of https://github.com/madanagopalt/pxCore into ii
madanagopaltcomcast Apr 15, 2020
f10f912
Update rtPromise.h
madanagopalt Apr 15, 2020
61d6303
Update rtPromise.h
madanagopalt Apr 15, 2020
08f74fa
Update rtScriptNode.cpp
madanagopalt Apr 15, 2020
1edde47
Update rtPromise.h
madanagopalt Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/rtPromise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class rtPromise: public rtObject
rtMethod1ArgAndNoReturn("reject",reject,rtValue);
rtProperty(promiseId, getPromiseId, setPromiseId, rtString);

rtPromise() : /*promise_id(promiseID++),*/ promise_name(""), mState(PENDING), mObject(NULL)
rtPromise() : /*promise_id(promiseID++),*/ promise_name(""), mState(PENDING), mObject(NULL), mRcvdRejectBeforeThen(false)
{
// rtLogDebug("############# PROMISE >> CREATED [ id: %d ] \n", promise_id);
}
Expand Down Expand Up @@ -100,6 +100,10 @@ class rtPromise: public rtObject
{
if (reject)
{
if (mRcvdRejectBeforeThen == true && (NULL != mObject)) {
mObject = new rtObject;
mRcvdRejectBeforeThen = false;
}
reject.send(mObject);
newPromise = new rtPromise;
newPromise.send("reject",mObject);
Expand Down Expand Up @@ -162,6 +166,9 @@ class rtPromise: public rtObject
{
mObject = objRef.getPtr();
}
if (mThenData.size() == 0) {
mRcvdRejectBeforeThen = true;
}
if (mObject != NULL)
{
for (std::vector<thenData>::iterator it = mThenData.begin();
Expand All @@ -175,7 +182,6 @@ class rtPromise: public rtObject
}
}
mThenData.clear();
mObject = objRef.getPtr();
return RT_OK;
}

Expand Down Expand Up @@ -209,6 +215,7 @@ class rtPromise: public rtObject
rtPromiseState mState;
std::vector<thenData> mThenData;
rtIObject* mObject;
bool mRcvdRejectBeforeThen;
};

// uint32_t rtPromise::promiseID = 0;
Expand Down
4 changes: 4 additions & 0 deletions src/rtScriptV8/rtScriptNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,11 @@ void rtNodeContext::createEnvironment()
#ifdef USE_NODE_PLATFORM
rtString currentPath;
rtGetCurrentDirectory(currentPath);
#ifdef WIN32
node::InspectorStart(mEnv, currentPath.cString(), platform);
#else
node::InspectorStart(mEnv, currentPath.cString(), "", 0);
#endif
#endif //USE_NODE_PLATFORM
#endif
#endif
Expand Down