Changeset 8307

Show
Ignore:
Timestamp:
16/12/11 11:17:35 (5 months ago)
Author:
westram
Message:
  • missing context in ED4_remote_set_cursor_cb
  • NULL-deref in ED4_host::announce_current_species (if no species selected yet)
Location:
branches/e4fix/EDIT4
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/e4fix/EDIT4/ED4_no_class.cxx

    r8306 r8307  
    652652} 
    653653 
    654 void ED4_remote_set_cursor_cb(AW_root *awr, AW_CL /* cd1 */, AW_CL /* cd2 */) 
    655 { 
     654void ED4_remote_set_cursor_cb(AW_root *awr, AW_CL /* cd1 */, AW_CL /* cd2 */) { 
    656655    AW_awar *awar = awr->awar(AWAR_SET_CURSOR_POSITION); 
    657656    long     pos  = awar->read_int(); 
    658657 
    659658    if (pos != -1) { 
     659        ED4_MostRecentWinContext context; 
    660660        ED4_cursor *cursor = &current_cursor(); 
    661661        cursor->jump_sequence_pos(pos, ED4_JUMP_CENTERED); 

  • branches/e4fix/EDIT4/ED4_plugins.cxx

    r8274 r8307  
    5353    void announce_current_species(const char *species_name) { 
    5454        ED4_base *base = ED4_ROOT->main_manager->find_first_that(ED4_L_SEQUENCE_STRING, has_species_name, (AW_CL)species_name); 
    55         seq_term       = base->to_sequence_terminal(); 
     55        seq_term       = base ? base->to_sequence_terminal() : NULL; 
    5656    } 
    5757