This repository was archived by the owner on Jun 22, 2025. It is now read-only.
Reformatted code and wip file importing #10
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # CMakeLists.txt # external/vtflib # src/cli/action_convert.cpp # src/cli/action_convert.hpp # src/common/enums.cpp # src/gui/viewer.cpp # src/gui/viewer.hpp
JJL772
suggested changes
Aug 3, 2022
JJL772
suggested changes
Aug 3, 2022
…port-files # Conflicts: # src/gui/viewer.cpp
# Conflicts: # src/gui/viewer.cpp
JJL772
suggested changes
Aug 3, 2022
|
Currently crashing when importing a file if no file was opened before. Investigating. |
|
Found crash point: // Select the correct image format
for (int i = 0; i < util::ArraySize(IMAGE_FORMATS); ++i) {
if (IMAGE_FORMATS[i].format == file->GetFormat()) {
// FIXME: IT CRASHES HERE
formatCombo_->setCurrentIndex(i);
break;
}
}At line 520, the program segfaults. Note that this only happens if the first thing done by the user is import the file. |
* removed useless variable
* fixed segfault when importing file * fixed save button not working (previours commit)
JJL772
approved these changes
Aug 5, 2022
There was a problem hiding this comment.
This looks good now, thanks for the help!
In the future, let's try to use rebase for PRs though. Makes it much easier to review in GitHub since it helps keep your changes separate from ones on the main branch. Let me know if you need a walk-through on rebasing!
|
Definitely, next time I'll use rebase. Thank you very much <3 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.