Changeset 673 for trunk/core/gui_osd.c


Ignore:
Timestamp:
01/08/09 18:18:03 (4 years ago)
Author:
phyrephox
Message:

g9 - fixed bug which prevented the disabling of CHDK RAW when CANON RAW was enabled (now it also is shown in the "warning window" when DNG/RAW is disabled)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/gui_osd.c

    r655 r673  
    783783    int x, m=(mode_get()&MODE_SHOOTING_MASK); 
    784784    static int b; 
    785     if ((!((movie_status > 1) && conf.save_raw_in_video   )) && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) && (!((m==MODE_AUTO) && conf.save_raw_in_auto)) && (!(conf.edge_overlay_enable && conf.save_raw_in_edgeoverlay)) && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS)))  && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)>=2) && conf.save_raw_in_timer)) && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) ) 
     785    if ((!((movie_status > 1) && conf.save_raw_in_video   )) && (!(shooting_get_prop(PROPCASE_RESOLUTION)==5)) && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) && (!((m==MODE_AUTO) && conf.save_raw_in_auto)) && (!(conf.edge_overlay_enable && conf.save_raw_in_edgeoverlay)) && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS)))  && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)>=2) && conf.save_raw_in_timer)) && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) ) 
    786786    {  
    787787    if (conf.show_remaining_raw)  
Note: See TracChangeset for help on using the changeset viewer.