= NOT A TEACHER =
In my humble opinion neither of the quoted sentences is a conditional sentence. The mere fact that both begin with 'if' doesn't make them automatically conditionals. Since we share the same mother tongue, let me explain the substance with a Polish example (readers of other nationalities, please forgive). In either sentence you could use the Polish equivalent 'jeśli' but you could also use 'skoro' (not a conditional-opening adverb) instead.
In the second example, the usage of Past Perfect in the main clause simply places the action back in time relative to the clause with a question. If the action sequence doesn't need an emphasis, the first example sounds a lot more natural.
Student or Learner