fix blackscreen if wrong rc selection
Merge remote-tracking branch 'hdf/master'