diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp index 70a414b52..8569fd830 100755 --- a/xvaga/xvaga.cpp +++ b/xvaga/xvaga.cpp @@ -3665,14 +3665,17 @@ long xvt_timer_create(WINDOW win, long interval) void xvt_timer_destroy(long id) { - CAST_TWIN(id, w); - wxTimer*& t = w._timer; - if (t != NULL) - { - t->Stop(); - delete t; - t = NULL; - } + if (id > 0L) + { + CAST_TWIN(id, w); + wxTimer*& t = w._timer; + if (t != NULL) + { + t->Stop(); + delete t; + t = NULL; + } + } } /////////////////////////////////////////////////////////// @@ -3879,7 +3882,7 @@ void xvt_vobj_move(WINDOW win, RCT *rctp) { CAST_WIN(win, w); wxRect rct = NormalizeRCT(rctp); - w.Move(rctp->left, rctp->top); + w.Move(rct.x, rct.y); w.SetClientSize(rct.width, rct.height); }