Merge "Remove null-ptr deref compiler warning."

                        while (cur && cur->next != mLastTrack) {

                            cur = cur->next;

                        }

                        if (cur) {

                            cur->next = NULL;

                        }

                        delete mLastTrack;

                        mLastTrack = cur;

                    }