Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(color): Duplicate model, write pending changes first #2579

Merged
merged 1 commit into from Oct 17, 2022

Conversation

dlktdr
Copy link
Collaborator

@dlktdr dlktdr commented Oct 16, 2022

Should only affect if you try to duplicate the current model.

If a write is pending, change of labels, etc. it wouldn't get copied into the duplicated model, but the labels still would have still been added to labels.yml until a re-scan.

Potential cause of issue #2561

@dlktdr dlktdr changed the title fix(color): Write pending changes first case duplicating current model fix(color): Duplicate model, write pending changes first Oct 16, 2022
@raphaelcoeffic raphaelcoeffic added this to the 2.8 milestone Oct 16, 2022
@pfeerick pfeerick added bug 🪲 Something isn't working color Related generally to color LCD radios labels Oct 17, 2022
@pfeerick pfeerick merged commit 58866c1 into EdgeTX:main Oct 17, 2022
shane-droid added a commit to shane-droid/edgetx that referenced this pull request Aug 12, 2023
…icSwitch2-testmergeMain-18oct22

* 'main' of https://github.com/EdgeTX/edgetx: (101 commits)
  feat(color): mix/output bars show '0%' (EdgeTX#2592)
  fix(lua): send EVT_VIRTUAL_EXIT only on short EXIT press (EdgeTX#2573)
  fix(color): Write pending changes to model before duplicate (EdgeTX#2579)
  fix(color): min/max highlighting should depend on mixer channel value (EdgeTX#2582)
  fix(gf): reset global function context if disabled (EdgeTX#2578)
  fix(color): clear spectrum analyser data buffer on init
  fix(color): check `theme` before accessing it
  fix(cpn): Workaround MacOS 13 filesystem type change (EdgeTX#2564)
  chore(adc): store constant structs in FLASH (EdgeTX#2551)
  fix(color): copy/paste inputs/mixers (EdgeTX#2545)
  fix(color): RF power drop-down (EdgeTX#2547)
  fix(color): module setup sub-type after selecting MPM (EdgeTX#2548)
  fix(B&W): `a~x` not being displayed correctly (EdgeTX#2539)
  fix(X10): Simulated page up in menu toolbar (EdgeTX#2543)
  fix: hard coded special characters (EdgeTX#2538)
  feat(color): single press to trigger model select menu (EdgeTX#2533)
  fix(color): shortcut for model select (EdgeTX#2528)
  fix(color): screen / widget setup (EdgeTX#2532)
  fix(NV14/EL18): Reduce LCD pixel clock to 1000000 (EdgeTX#2525)
  fix: clear internal module FIFO after DMA init (EdgeTX#2527)
  ...

# Conflicts:
#	radio/src/fonts/lvgl/lv_font_noto_cn_24.c
#	radio/src/fonts/lvgl/lv_font_noto_tw_24.c
#	radio/src/gui/colorlcd/model_mixes.cpp
#	radio/src/gui/colorlcd/output_edit.cpp
#	radio/src/gui/colorlcd/screen_setup.cpp
#	radio/src/gui/colorlcd/view_about.cpp
#	radio/src/storage/modelslist.cpp
#	radio/src/translations/cn.h
#	radio/src/translations/de.h
#	radio/src/translations/en.h
#	radio/src/translations/se.h
#	radio/src/translations/tw.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug 🪲 Something isn't working color Related generally to color LCD radios
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants